From c3ac2340d87078daa7e8877329fd4270ecb7fbe7 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Tue, 28 May 2024 10:48:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/detail.vue       |   1 +
 pages/login/index.vue        | 665 +++++++++++++++++++----------------
 pages/news/consult/about.vue |   9 +-
 pages/news1/jinqun.vue       |  22 +-
 4 files changed, 389 insertions(+), 308 deletions(-)

diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index ea57e10..09a78df 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -530,6 +530,7 @@
 			}
 		},
 		onLoad(options) {
+			console.log(options)
 			const that = this;
 			that.options = options;
 			let result = uni.getStorageSync("addressResult")
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 2fc65ab..593f83f 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -1,322 +1,391 @@
 <template>
-  <view class="login">
-    <view class="refund-navbar">
-      <u-navbar
-        title=""
-        :border-bottom="false"
-        :background="background"
-      ></u-navbar>
-    </view>
-    <view class="login-hd">
-      <view class="a">验证码登录</view>
-      <view class="b">若该手机号未注册，我们将自动为您注册</view>
-    </view>
-    <view class="login-bd">
-      <view class="a"
-        >+86<input v-model="phoneNum" type="tel" placeholder="请输入手机号"
-      /></view>
-      <view class="b">
-        <input v-model="semCode" placeholder="请输入验证码" />
-        <text @click="getCode" v-if="!showCountDown">获取验证码</text>
-        <text v-if="showCountDown">{{ countdown }}s</text>
-      </view>
-      <view class="c" style="display: flex; align-items: center">
-        <u-checkbox
-          active-color="#FF343C"
-          v-model="isCheckout"
-          style="margin-right: -20rpx"
-        ></u-checkbox
-        >同意<text @click="toTextPage(1)">《用户服务协议》</text>和<text
-          @click="toTextPage(2)"
-          >《隐私政策》</text
-        >
-      </view>
-    </view>
-    <view class="login-fd login-fd-on" @click="login">登录</view>
-    <view class="" v-if="isCheckout">
-      <mpWeiXinMobile :refereeId="refereeId"></mpWeiXinMobile>
-    </view>
-    <view
-      class=""
-      v-else
-      style="
+	<view class="login">
+		<view class="refund-navbar">
+			<u-navbar title="" :border-bottom="false" :background="background"></u-navbar>
+		</view>
+		<view class="login-hd">
+			<view class="a">验证码登录</view>
+			<view class="b">若该手机号未注册，我们将自动为您注册</view>
+		</view>
+		<view class="login-bd">
+			<view class="a">+86<input v-model="phoneNum" type="tel" placeholder="请输入手机号" /></view>
+			<view class="b">
+				<input v-model="semCode" placeholder="请输入验证码" />
+				<text @click="getCode" v-if="!showCountDown">获取验证码</text>
+				<text v-if="showCountDown">{{ countdown }}s</text>
+			</view>
+			<view class="c" style="display: flex; align-items: center">
+				<u-checkbox active-color="#FF343C" v-model="isCheckout" style="margin-right: -20rpx"></u-checkbox>
+				同意<text @click="toTextPage(1)">《用户服务协议》</text>和<text @click="toTextPage(2)">《隐私政策》</text>
+			</view>
+		</view>
+		<view class="login-fd login-fd-on" @click="login">登录</view>
+		<view class="" v-if="isCheckout">
+			<mpWeiXinMobile :refereeId="refereeId"></mpWeiXinMobile>
+		</view>
+		<view class="" v-else style="
         font-size: 28rpx;
         color: #666;
         text-align: center;
         margin-top: 50rpx;
-      "
-      @click="login"
-    >
-      手机号快捷登录
-    </view>
-  </view>
+      " @click="login">
+			手机号快捷登录
+		</view>
+	</view>
+	<view class="login-box" style="display: none;">
+		<view class="refund-navbar">
+			<u-navbar title="" :border-bottom="false" background="rgba(255, 233, 240, 1)"></u-navbar>
+		</view>
+		<view class="login-logo">
+			<image src="../../static/login_logo.png" mode=""></image>
+		</view>
+		<view class="login-name">
+			京苏云商
+		</view>
+		<view class="c">
+			<u-checkbox active-color="#FF343C" v-model="isCheckout" style="margin-right: -20rpx"></u-checkbox>
+			同意<text @click="toTextPage(1)">《用户服务协议》</text>和<text @click="toTextPage(2)">《隐私政策》</text>
+		</view>
+		<view class="fd fd-on" @click="login">登录</view>
+	</view>
 </template>
 
 <script>
-import * as UserApi from "@/api/user";
-import * as CaptchaApi from "@/api/captcha";
-import mpWeiXinMobile from "./components/mp-weixin-mobile.vue";
-import store from "@/store";
-import { isEmpty } from "@/utils/util";
-import { getSceneData } from '@/core/app'
-export default {
-  components: {
-    mpWeiXinMobile,
-  },
-  data() {
-    return {
-      isCheckout: false,
-      showCountDown: false,
-      currentIndex: 0,
-      background: {
-        background: `url(${this.$picUrl}/static/news/login-bg.png) center top no-repeat`,
-        backgroundSize: "100% auto",
-      },
-      phoneNum: "",
-      semCode: "",
-      countdown: 60,
-      countDownFun: null,
-      code: "",
-      refereeId: "",
-    };
-  },
-  onLoad(o) {
-	// 获取二维码场景值
-	const scene = getSceneData(o)
-	// 记录推荐人ID
-	const refereeId = scene.refereeId ? scene.refereeId : (scene.uid?scene.uid:o.refereeId)
-    this.refereeId = refereeId;
-	console.log(scene)
-	console.log(o)
-	console.log(scene.refereeId)
-	console.log("refereeId",refereeId)
-	console.log(this.refereeId)
-  },
-  methods: {
-    toTextPage(n) {
-      uni.navigateTo({
-        url: "/pages/news1/text?pageFlag=" + n,
-      });
-    },
-    validatePhoneNumber(phone) {
-      // 定义手机号码的正则表达式
-      var regExp = /^1[3456789]\d{9}$/;
+	import * as UserApi from "@/api/user";
+	import * as CaptchaApi from "@/api/captcha";
+	import mpWeiXinMobile from "./components/mp-weixin-mobile.vue";
+	import store from "@/store";
+	import {
+		isEmpty
+	} from "@/utils/util";
+	import {
+		getSceneData
+	} from '@/core/app'
+	export default {
+		components: {
+			mpWeiXinMobile,
+		},
+		data() {
+			return {
+				isCheckout: false,
+				showCountDown: false,
+				currentIndex: 0,
+				background: {
+					background: `url(${this.$picUrl}/static/news/login-bg.png) center top no-repeat`,
+					backgroundSize: "100% auto",
+				},
+				phoneNum: "",
+				semCode: "",
+				countdown: 60,
+				countDownFun: null,
+				code: "",
+				refereeId: "",
+			};
+		},
+		onLoad(o) {
+			// 获取二维码场景值
+			const scene = getSceneData(o)
+			// 记录推荐人ID
+			const refereeId = scene.refereeId ? scene.refereeId : (scene.uid ? scene.uid : o.refereeId)
+			this.refereeId = refereeId;
+			console.log(scene)
+			console.log(o)
+			console.log(scene.refereeId)
+			console.log("refereeId", refereeId)
+			console.log(this.refereeId)
+		},
+		methods: {
+			toTextPage(n) {
+				uni.navigateTo({
+					url: "/pages/news1/text?pageFlag=" + n,
+				});
+			},
+			validatePhoneNumber(phone) {
+				// 定义手机号码的正则表达式
+				var regExp = /^1[3456789]\d{9}$/;
 
-      if (regExp.test(phone)) {
-        return true; // 符合手机号码格式要求
-      } else {
-        return false; // 不符合手机号码格式要求
-      }
-    },
-    getCode() {
-      // 获取验证码
-      const that = this;
-	  if (that.isCheckout == false) {
-	    that.$toast("请勾选用户协议");
-	    return;
-	  }
-      if (!that.validatePhoneNumber(that.phoneNum)) {
-        uni.showToast({
-          title: "请输入正确的手机号",
-        });
-        return;
-      }
-      that.showCountDown = !that.showCountDown;
-      
-      CaptchaApi.sendSmsCaptcha({
-          mobile: that.phoneNum
-      }).then((res) => {
-        if (res.status == 200) {
-			that.countDownFun = setInterval(() => {
-			  if (that.countdown >= 1) {
-				that.countdown = that.countdown - 1;
-			  } else {
-				that.showCountDown = false;
-				that.countdown = 60;
-				clearInterval(that.countDownFun);
-			  }
-			}, 1000);
-          uni.showToast({
-			  icon:"none",
-            title: res.message,
-          });
-        } else {
-          uni.showToast({
-			    icon:"none",
-            title: res.message,
-          });
-        }
-      });
-    },
-    login() {
-      let that = this;
-      if (that.isCheckout == false) {
-        that.$toast("请勾选用户协议");
-        return;
-      }
-      // 登录
-      if (!that.validatePhoneNumber(that.phoneNum)) {
-        that.$toast("请输入正确的手机号");
-        return;
-      }
-      if (that.semCode == "") {
-        that.$toast("请输入验证码");
-        return;
-      }
-      uni.login({
-        provider: "weixin",
-        success: function (res) {
-          store
-            .dispatch("Login", {
-              smsCode: that.semCode,
-              mobile: that.phoneNum,
-              refereeId: that.refereeId,
-              isParty: false,
-              partyData: {},
-              ucode: res.code
-            })
-            .then((res) => {
-              uni.setStorageSync("token", res.data.token);
-              that.$toast(res.message);
-              that.getUserInfo();
-              setTimeout(() => that.onNavigateBack(1), 2000);
-            });
-        },
-		fail:function(){
-			store
-            .dispatch("Login", {
-              smsCode: that.semCode,
-              mobile: that.phoneNum,
-              refereeId: that.refereeId,
-              isParty: false,
-              partyData: {},
-            //   ucode: res.code
-            })
-            .then((res) => {
-              uni.setStorageSync("token", res.data.token);
-              that.$toast(res.message);
-              that.getUserInfo();
-              setTimeout(() => that.onNavigateBack(1), 2000);
-            });
-		}
-      });
-    },
-    getUserInfo() {
-      UserApi.info().then((result) => {
-        uni.setStorageSync("userInfo", result.data.userInfo);
-      });
-    },
-    onNavigateBack(delta = 1) {
-      // 登录成功返回原页面
-      const pages = getCurrentPages();
-      if (pages.length > 1) {
-        uni.navigateBack({
-          delta: Number(delta || 1),
-        });
-      } else {
-        this.$navTo("pages/index/index");
-      }
-    },
-  },
-};
+				if (regExp.test(phone)) {
+					return true; // 符合手机号码格式要求
+				} else {
+					return false; // 不符合手机号码格式要求
+				}
+			},
+			getCode() {
+				// 获取验证码
+				const that = this;
+				if (that.isCheckout == false) {
+					that.$toast("请勾选用户协议");
+					return;
+				}
+				if (!that.validatePhoneNumber(that.phoneNum)) {
+					uni.showToast({
+						title: "请输入正确的手机号",
+					});
+					return;
+				}
+				that.showCountDown = !that.showCountDown;
+
+				CaptchaApi.sendSmsCaptcha({
+					mobile: that.phoneNum
+				}).then((res) => {
+					if (res.status == 200) {
+						that.countDownFun = setInterval(() => {
+							if (that.countdown >= 1) {
+								that.countdown = that.countdown - 1;
+							} else {
+								that.showCountDown = false;
+								that.countdown = 60;
+								clearInterval(that.countDownFun);
+							}
+						}, 1000);
+						uni.showToast({
+							icon: "none",
+							title: res.message,
+						});
+					} else {
+						uni.showToast({
+							icon: "none",
+							title: res.message,
+						});
+					}
+				});
+			},
+			login() {
+				let that = this;
+				if (that.isCheckout == false) {
+					that.$toast("请勾选用户协议");
+					return;
+				}
+				// 登录
+				if (!that.validatePhoneNumber(that.phoneNum)) {
+					that.$toast("请输入正确的手机号");
+					return;
+				}
+				if (that.semCode == "") {
+					that.$toast("请输入验证码");
+					return;
+				}
+				uni.login({
+					provider: "weixin",
+					success: function(res) {
+						store
+							.dispatch("Login", {
+								smsCode: that.semCode,
+								mobile: that.phoneNum,
+								refereeId: that.refereeId,
+								isParty: false,
+								partyData: {},
+								ucode: res.code
+							})
+							.then((res) => {
+								uni.setStorageSync("token", res.data.token);
+								that.$toast(res.message);
+								that.getUserInfo();
+								setTimeout(() => that.onNavigateBack(1), 2000);
+							});
+					},
+					fail: function() {
+						store
+							.dispatch("Login", {
+								smsCode: that.semCode,
+								mobile: that.phoneNum,
+								refereeId: that.refereeId,
+								isParty: false,
+								partyData: {},
+								//   ucode: res.code
+							})
+							.then((res) => {
+								uni.setStorageSync("token", res.data.token);
+								that.$toast(res.message);
+								that.getUserInfo();
+								setTimeout(() => that.onNavigateBack(1), 2000);
+							});
+					}
+				});
+			},
+			getUserInfo() {
+				UserApi.info().then((result) => {
+					uni.setStorageSync("userInfo", result.data.userInfo);
+				});
+			},
+			onNavigateBack(delta = 1) {
+				// 登录成功返回原页面
+				const pages = getCurrentPages();
+				if (pages.length > 1) {
+					uni.navigateBack({
+						delta: Number(delta || 1),
+					});
+				} else {
+					this.$navTo("pages/index/index");
+				}
+			},
+		},
+	};
 </script>
 
 <style lang="scss" scoped>
-.login {
-  width: 100%;
-  background: #fffafb url(https://www.royaum.com.cn/static/news/login-bg.png)
-    center top no-repeat;
-  background-size: 100% auto;
-  min-height: 100vh;
+	.login-box {
+		width: 100%;
+		background: linear-gradient(180deg, rgba(255, 233, 240, 1) 0%, rgba(226, 244, 243, 0) 35%);
+		min-height: 100vh;
 
-  &-hd {
-    padding: 90rpx 75rpx 75rpx;
-    overflow: hidden;
+		.login-logo {
+			margin: 365rpx auto 0 auto;
+			width: 132rpx;
+			height: 132rpx;
+			border-radius: 24rpx;
+			background: rgba(243, 74, 64, 1);
+			box-shadow: -4rpx -8rpx 20rpx rgba(243, 74, 64, 0.16);
 
-    .a {
-      line-height: 80rpx;
-      font-size: 40rpx;
-      font-weight: 500;
-      color: #000000;
-    }
+			image {
+				width: 75rpx;
+				height: 85rpx;
+				margin: 23.5rpx 0 0 28.5rpx;
+			}
+		}
 
-    .b {
-      font-size: 28rpx;
-      font-weight: 400;
-      color: #5a5a5a;
-      line-height: 50rpx;
-    }
-  }
+		.login-name {
+			width: 100%;
+			text-align: center;
 
-  &-bd {
-    padding: 0 75rpx;
-    overflow: hidden;
+			font-weight: bold;
+			font-size: 36rpx;
+			color: rgba(243, 74, 64, 1);
+			margin-top: 22rpx;
+		}
 
-    .a {
-      padding: 20rpx 0;
-      border-bottom: 1px solid #f2f2f2;
-      display: flex;
-      align-items: center;
-      font-size: 32rpx;
-      font-weight: 400;
-      color: #212121;
+		.c {
+			justify-content: center;
+			padding: 28rpx 0;
+			font-size: 26rpx;
+			font-weight: 400;
+			color: #a0a0a0;
+			display: flex;
+			align-items: center;
 
-      input {
-        flex: 1;
-        margin-left: 30rpx;
-        line-height: 50rpx;
-        border-left: 1px solid #c4c4c4;
-        padding-left: 30rpx;
-        font-size: 28rpx;
-        color: #212121;
-      }
-    }
+			text {
+				color: #ff343c;
+			}
 
-    .b {
-      padding: 30rpx 0;
-      border-bottom: 1px solid #f2f2f2;
-      display: flex;
-      align-items: center;
-      font-size: 28rpx;
-      font-weight: 400;
-      color: #f3202a;
+			::v-deep .u-checkbox__icon-wrap--square {
+				border-radius: 50% !important;
+				width: 17px !important;
+				height: 17px !important;
+			}
+		}
 
-      input {
-        flex: 1;
-        margin-right: 30rpx;
-        line-height: 50rpx;
-        font-size: 28rpx;
-        color: #212121;
-      }
-    }
+		.fd {
+			width: 680rpx;
+			line-height: 88rpx;
+			background: rgba(243, 74, 64, 1);
+			border-radius: 88rpx;
+			text-align: center;
+			margin: 0 auto;
+			margin-top: 50rpx;
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #ffffff;
+
+			.fd-on {
+				background-color: rgba(243, 74, 64, 1);
+			}
+		}
+	}
 
-    .c {
-      padding: 28rpx 0;
-      font-size: 28rpx;
-      font-weight: 400;
-      color: #a0a0a0;
+	.login {
+		width: 100%;
+		background: #fffafb url(https://www.royaum.com.cn/static/news/login-bg.png) center top no-repeat;
+		background-size: 100% auto;
+		min-height: 100vh;
 
-      text {
-        color: #ff343c;
-      }
-    }
-  }
+		&-hd {
+			padding: 90rpx 75rpx 75rpx;
+			overflow: hidden;
 
-  &-fd {
-    width: 680rpx;
-    line-height: 88rpx;
-    background: #ffbdba;
-    border-radius: 88rpx;
-    text-align: center;
-    margin: 0 auto;
-    margin-top: 120rpx;
-    font-size: 28rpx;
-    font-weight: 600;
-    color: #ffffff;
+			.a {
+				line-height: 80rpx;
+				font-size: 40rpx;
+				font-weight: 500;
+				color: #000000;
+			}
+
+			.b {
+				font-size: 28rpx;
+				font-weight: 400;
+				color: #5a5a5a;
+				line-height: 50rpx;
+			}
+		}
 
-    &-on {
-      background-color: #ff343c;
-    }
-  }
-}
-</style>
+		&-bd {
+			padding: 0 75rpx;
+			overflow: hidden;
+
+			.a {
+				padding: 20rpx 0;
+				border-bottom: 1px solid #f2f2f2;
+				display: flex;
+				align-items: center;
+				font-size: 32rpx;
+				font-weight: 400;
+				color: #212121;
+
+				input {
+					flex: 1;
+					margin-left: 30rpx;
+					line-height: 50rpx;
+					border-left: 1px solid #c4c4c4;
+					padding-left: 30rpx;
+					font-size: 28rpx;
+					color: #212121;
+				}
+			}
+
+			.b {
+				padding: 30rpx 0;
+				border-bottom: 1px solid #f2f2f2;
+				display: flex;
+				align-items: center;
+				font-size: 28rpx;
+				font-weight: 400;
+				color: #f3202a;
+
+				input {
+					flex: 1;
+					margin-right: 30rpx;
+					line-height: 50rpx;
+					font-size: 28rpx;
+					color: #212121;
+				}
+			}
+
+			.c {
+				padding: 28rpx 0;
+				font-size: 28rpx;
+				font-weight: 400;
+				color: #a0a0a0;
+
+				text {
+					color: #ff343c;
+				}
+			}
+		}
+
+		&-fd {
+			width: 680rpx;
+			line-height: 88rpx;
+			background: #ffbdba;
+			border-radius: 88rpx;
+			text-align: center;
+			margin: 0 auto;
+			margin-top: 120rpx;
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #ffffff;
+
+			&-on {
+				background-color: #ff343c;
+			}
+		}
+	}
+</style>
diff --git a/pages/news/consult/about.vue b/pages/news/consult/about.vue
index 7a3b739..8760a2d 100644
--- a/pages/news/consult/about.vue
+++ b/pages/news/consult/about.vue
@@ -13,7 +13,9 @@
 			<view class="b">{{cityInfo.phone}}<image :src="$picUrl+'/static/news/tel.png'" @click="callPhone()"></image></view>
 		</view>
 		<view class="park-fd">
-			<image :src="cityInfo.wechat" show-menu-by-longpress='1'></image>
+				<!-- <image :src="cityInfo.wechat" show-menu-by-longpress='1'></image> -->
+			<!--  -->
+			<image mode="widthFix" :src="cityInfo.wechat"></image>
 			<view class="txt">长按识别二维码</view>
 			<view class="txt">添加我的微信</view>
 		</view>
@@ -141,15 +143,16 @@
 		text-align: center;
 		image{
 			width: 300rpx;
-			height: 300rpx;
+			// height: 300rpx;
 			display: block;
 			margin: 0 auto;
+			max-height:400rpx ;
 		}
 		.txt{
 			font-size: 32rpx;
 			font-weight: 400;
 			color: #686868;
-			margin-top: 20rpx;
+			margin-top: 30rpx;
 		}
 	}
 	&-btn{
diff --git a/pages/news1/jinqun.vue b/pages/news1/jinqun.vue
index ff8ccba..dda1325 100644
--- a/pages/news1/jinqun.vue
+++ b/pages/news1/jinqun.vue
@@ -56,25 +56,33 @@
 		}
 	}
 </script>
-
+<style>
+	page {
+		width: 100% !important;
+		height: 100%;
+		background-color: #E2b257;
+	}
+</style>
 <style lang="scss" scoped>
 	.jinqun {
 		.image-box {
-			width: 330rpx;
-			height: 330rpx;
-			margin: 420rpx auto;
+			overflow: hidden;
+			width: 335rpx;
+			height: 335rpx;
+			margin: 485rpx auto 0 auto;
 
 			.image {
 				width: 100%;
 				height: 100%;
 			}
 		}
-       overflow: hidden;
+
+		overflow: hidden;
 		height:100%;
-		position: relative;
+		// position: relative;
 		background-repeat: no-repeat;
 		background-size: cover;
-		min-height: 100vh;
+		height: 1325rpx;
 
 		.flag {
 			position: absolute;