From af4cfe7fba48931bf31d46c6ec2ed0c52cf57c8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E5=BE=88=E5=B7=AE=E5=95=A6?=
 <17633066053@163.com>
Date: Mon, 10 Apr 2023 11:18:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20:bug:=20=E6=96=B0=E5=A2=9E=E5=A4=87?=
 =?UTF-8?q?=E7=94=A8=E7=99=BB=E5=BD=95=E6=96=B9=E6=A1=88=E3=80=81=E5=B9=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BA=97=E9=93=BA=E5=90=8D=E7=A7=B0=E8=BF=87?=
 =?UTF-8?q?=E9=95=BF=E5=AF=BC=E8=87=B4=E6=98=BE=E7=A4=BA=E9=94=99=E4=B9=B1?=
 =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98=E3=80=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E8=87=AA=E5=8A=A8=E5=8F=91=E5=88=B8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/config.js                            |   3 +-
 pages/order/myOrder.vue                     |   8 +-
 pages/order/orderDetail.vue                 |  14 +
 pages/passport/wechatMPLogin.vue            | 556 +++++++++++---------
 pages/tabbar/cart/cartList.vue              |   6 +-
 pages/tabbar/home/template/fetch_coupon.vue |   4 +-
 6 files changed, 336 insertions(+), 255 deletions(-)

diff --git a/config/config.js b/config/config.js
index 67edeb8..5ac1e8e 100644
--- a/config/config.js
+++ b/config/config.js
@@ -22,5 +22,6 @@ export default {
   mainColor: "#ff3c2a", // 主题色
   lightColor: "#ff6b35", // 高亮主题色
   aiderLightColor: "#ff9f28", // 辅助高亮颜色
-  defaultUserPhoto:"/static/missing-face.png" // 默认用户头像
+  defaultUserPhoto: "/static/missing-face.png", // 默认用户头像
+  enableFetchMobileLogin: true // 是否启用获取手机号登录 如果微信小程序提示封禁手机号获取权限 可将此选项设置成false作为备用登录方案
 };
diff --git a/pages/order/myOrder.vue b/pages/order/myOrder.vue
index a22bb10..5f6c2fc 100644
--- a/pages/order/myOrder.vue
+++ b/pages/order/myOrder.vue
@@ -40,8 +40,8 @@
           >
             <!-- 店铺名称 -->
             <view class="seller-info u-flex u-row-between">
-              <view class="seller-name" @click="navigateToStore(order)">
-                <view class="name">{{ order.storeName }}</view>
+              <view class="seller-name wes" @click="navigateToStore(order)">
+                <view class="name wes">{{ order.storeName }}</view>
               </view>
               <view class="order-sn">{{
                 order.orderStatus | orderStatusList
@@ -689,6 +689,7 @@ page,
     padding: 0 20rpx;
 
     .seller-name {
+      flex:10;
       font-size: 28rpx;
       font-weight: 600;
       display: flex;
@@ -701,6 +702,9 @@ page,
     }
 
     .order-sn {
+      flex:2;
+      width:120rpx;
+      text-align: center;
       color: $aider-light-color;
       font-size: 26rpx;
     }
diff --git a/pages/order/orderDetail.vue b/pages/order/orderDetail.vue
index 4d242b0..93a3d77 100644
--- a/pages/order/orderDetail.vue
+++ b/pages/order/orderDetail.vue
@@ -156,6 +156,12 @@
               order.createTime
           }}</view>
         </view>
+        <view class="order-info-view">
+          <view class="title">订单备注：</view>
+          <view class="value">{{
+              order.remark
+          }}</view>
+        </view>
         <view class="order-info-view">
           <view class="title">支付状态：</view>
           <view class="value">
@@ -753,4 +759,12 @@ page,
 .address-line-height{
   line-height: 1.75;
 }
+.seller-name{
+  >.name{
+    flex:10 !important;
+  }
+  >.status{
+    flex:2;
+  }
+}
 </style>
diff --git a/pages/passport/wechatMPLogin.vue b/pages/passport/wechatMPLogin.vue
index b58c991..22dd788 100644
--- a/pages/passport/wechatMPLogin.vue
+++ b/pages/passport/wechatMPLogin.vue
@@ -1,277 +1,337 @@
 <template>
-  <view class="container">
-    <u-navbar :custom-back="back" title="小程序登录"></u-navbar>
-    <u-modal v-model="phoneAuthPopup" :mask-close-able="true" :title="projectName+'商城'" :show-confirm-button="false">
-      <div class="tips">
-        为了更好地用户体验，需要您授权手机号
-      </div>
-      <button class="register" type="primary" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
-        去授权
-      </button>
-    </u-modal>
-    <view class="wx-auth-container">
-      <div class="box">
-        <view class="logo-info">
-          <text class="title">欢迎进入{{ projectName }}</text>
-        </view>
-        <view class="small-tips">
-          <view>为您提供优质服务,{{ projectName }}需要获取以下信息</view>
-          <view>您的公开信息（昵称、头像）</view>
-        </view>
-        <view class="btns">
-          <button type="primary" bindtap="getUserProfile" @click="getUserProfile()" class="btn-auth">使用微信授权</button>
-          <div @click="backToHome" class="btn-callback">暂不登录</div>
-        </view>
-      </div>
-    </view>
-  </view>
+	<view class="container">
+		<u-navbar :custom-back="back" title="小程序登录"></u-navbar>
+		<u-modal v-model="phoneAuthPopup" :mask-close-able="true" :title="projectName+'商城'"
+			:show-confirm-button="false">
+			<div class="tips">
+				为了更好地用户体验，需要您授权手机号
+			</div>
+			<button class="register" type="primary" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
+				去授权
+			</button>
+		</u-modal>
+		<view class="wx-auth-container">
+			<div class="box">
+				<view class="logo-info">
+					<text class="title">欢迎进入{{ projectName }}</text>
+				</view>
+				<view class="small-tips">
+					<view>为您提供优质服务,{{ projectName }}需要获取以下信息</view>
+					<view>您的公开信息（昵称、头像）</view>
+				</view>
+				<view class="btns">
+					<button type="primary" bindtap="getUserProfile" @click="getUserProfile()"
+						class="btn-auth">使用微信授权</button>
+					<div @click="backToHome" class="btn-callback">暂不登录</div>
+				</view>
+			</div>
+		</view>
+	</view>
 </template>
 
 <script>
-import { mpAutoLogin } from "@/api/connect.js";
+	import {
+		mpAutoLogin
+	} from "@/api/connect.js";
 
-import { whetherNavigate } from "@/utils/Foundation"; //登录跳转
-import { getUserInfo } from "@/api/members";
-import storage from "@/utils/storage.js";
-import config from '@/config/config'
-export default {
-  data() {
-    return {
-      // 是否展示手机号码授权弹窗，默认第一步不展示，要先获取用户基础信息
-      phoneAuthPopup: false,
-      // 授权信息展示，商城名称
-      projectName: config.name,
-      //微信返回信息，用于揭秘信息，获取sessionkey
-      code: "",
-      //微信昵称
-      nickName: "",
-      //微信头像
-      image: "",
-    };
-  },
+	import {
+		whetherNavigate
+	} from "@/utils/Foundation"; //登录跳转
+	import {
+		getUserInfo
+	} from "@/api/members";
+	import storage from "@/utils/storage.js";
+	import config from '@/config/config'
+	export default {
+		data() {
+			return {
+        configs:config,
+				// 是否展示手机号码授权弹窗，默认第一步不展示，要先获取用户基础信息
+				phoneAuthPopup: false,
+				// 授权信息展示，商城名称
+				projectName: config.name,
+				//微信返回信息，用于揭秘信息，获取sessionkey
+				code: "",
+				//微信昵称
+				nickName: "",
+				//微信头像
+				image: "",
+			};
+		},
 
-  //微信小程序进入页面，先获取code，否则几率出现code和后续交互数据不对应情况
-  mounted() {
-    // 小程序默认分享
-    uni.showShareMenu({ withShareTicket: true });
+		//微信小程序进入页面，先获取code，否则几率出现code和后续交互数据不对应情况
+		mounted() {
+			// 小程序默认分享
+			uni.showShareMenu({
+				withShareTicket: true
+			});
 
-    let that = this;
-    //获取code
-    uni.login({
-      success: (res) => {
-        that.code = res.code;
-      },
-    });
-  },
-  methods: {
-    /**
-     * TODO 此方法不一定是最优解，如果有更好的办法请在  https://gitee.com/beijing_hongye_huicheng/lilishop/issues 中提出
-     * 小程序返回bug
-     * 1.介于微信登录是在login.vue的基础上作为判断跳转来
-     * 所以在页面栈中会自动记录回退路径，所以导致每次微信小程序点击回退就会自动返回login页面
-     * 当然login页面的判断就是 没有登录就会跳转到微信小程序页面 导致了无法回退到之前页面
-     * 2.解决方法： 尝试在回退的时候判断地址，让回退多一级这样就避免了
-     */
+			let that = this;
+			
+		},
+		methods: {
+			/**
+			 * TODO 此方法不一定是最优解，如果有更好的办法请在  https://gitee.com/beijing_hongye_huicheng/lilishop/issues 中提出
+			 * 小程序返回bug
+			 * 1.介于微信登录是在login.vue的基础上作为判断跳转来
+			 * 所以在页面栈中会自动记录回退路径，所以导致每次微信小程序点击回退就会自动返回login页面
+			 * 当然login页面的判断就是 没有登录就会跳转到微信小程序页面 导致了无法回退到之前页面
+			 * 2.解决方法： 尝试在回退的时候判断地址，让回退多一级这样就避免了
+			 */
 
-    back() {
-      whetherNavigate("wx");
-    },
-    backToHome() {
-      uni.switchTab({
-        url: `/pages/tabbar/home/index`,
-      });
-    },
-    //获取用户信息
-    getUserProfile(e) {
-      let that = this;
-      // 推荐使用wx.getUserProfile获取用户信息，开发者每次通过该接口获取用户个人信息均需用户确认
-      uni.getUserProfile({
-        desc: "用于完善会员资料", // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
-        success: (res) => {
-          that.nickName = res.userInfo.nickName;
-          that.image = res.userInfo.avatarUrl;
-          //展示手机号获取授权
-          this.phoneAuthPopup = true;
-        },
-        fail: (res) => {
-          that.nickName = "微信用户";
-          that.image =
-            "https://thirdwx.qlogo.cn/mmopen/vi_32/POgEwh4mIHO4nibH0KlMECNjjGxQUq24ZEaGT4poC6icRiccVGKSyXwibcPq4BWmiaIGuG1icwxaQX6grC9VemZoJ8rg/132";
-          //展示手机号获取授权
-          this.phoneAuthPopup = true;
-        },
-      });
-    },
-    //获取手机号授权
-    getPhoneNumber(e) {
-      let iv = e.detail.iv;
-      let encryptedData = e.detail.encryptedData;
-      if (!e.detail.encryptedData) {
-        uni.showToast({
-          title: "请授予手机号码权限，手机号码会和会员系统用户绑定！",
-          icon: "none",
+			back() {
+				whetherNavigate("wx");
+			},
+			backToHome() {
+				uni.switchTab({
+					url: `/pages/tabbar/home/index`,
+				});
+			},
+
+
+
+
+			//获取用户信息
+			async getUserProfile(e) {
+        let that = this;
+        //获取code
+        await uni.login({
+          success: (res) => {
+            that.code = res.code;
+          },
         });
-        return;
-      }
+		
+				// 推荐使用wx.getUserProfile获取用户信息，开发者每次通过该接口获取用户个人信息均需用户确认
+				await uni.getUserProfile({
+					desc: "用于完善会员资料", // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
+					success: (res) => {
+						that.nickName = res.userInfo.nickName;
+						that.image = res.userInfo.avatarUrl;  
 
-      let code = this.code;
-      let image = this.image;
-      let nickName = this.nickName;
-      mpAutoLogin({
-        encryptedData,
-        iv,
-        code,
-        image,
-        nickName,
-      }).then((res) => {
-        storage.setAccessToken(res.data.result.accessToken);
-        storage.setRefreshToken(res.data.result.refreshToken);
-        // 登录成功
-        uni.showToast({
-          title: "登录成功!",
-          icon: "none",
-        });
-        //获取用户信息
-        getUserInfo().then((user) => {
-          storage.setUserInfo(user.data.result);
-          storage.setHasLogin(true);
+            /**
+             * 根据公有的配置设置登录方式
+             */
+            if(this.configs.enableFetchMobileLogin){
+              this.phoneAuthPopup = true;
+              return false
+            }
+						let iv = res.iv;
+						let encryptedData = res.encryptedData;
 
-          uni.navigateBack({
-            delta: 1,
-          });
-        });
-      });
-    },
-  },
-};
+						let code = this.code;
+						let image = this.image;
+						let nickName = this.nickName;
+						mpAutoLogin({
+							encryptedData,
+							iv,
+							code,
+							image,
+							nickName,
+						}).then((apiRes) => {
+							storage.setAccessToken(apiRes.data.result.accessToken);
+							storage.setRefreshToken(apiRes.data.result.refreshToken);
+							// 登录成功
+							uni.showToast({
+								title: "登录成功!",
+								icon: "none",
+							});
+							//获取用户信息
+							getUserInfo().then((user) => {
+								storage.setUserInfo(user.data.result);
+								storage.setHasLogin(true);
+
+								uni.navigateBack({
+									delta: 1,
+								});
+							});
+						});
+					},
+					fail: (res) => {
+
+					},
+				});
+			},
+
+			//获取手机号授权
+			getPhoneNumber(e) {
+			  let iv = e.detail.iv;
+			  let encryptedData = e.detail.encryptedData;
+			  if (!e.detail.encryptedData) {
+			    uni.showToast({
+			      title: "请授予手机号码权限，手机号码会和会员系统用户绑定！",
+			      icon: "none",
+			    });
+			    return;
+			  }
+
+			  let code = this.code;
+			  let image = this.image;
+			  let nickName = this.nickName;
+			  mpAutoLogin({
+			    encryptedData,
+			    iv,
+			    code,
+			    image,
+			    nickName,
+			  }).then((res) => {
+			    storage.setAccessToken(res.data.result.accessToken);
+			    storage.setRefreshToken(res.data.result.refreshToken);
+			    // 登录成功
+			    uni.showToast({
+			      title: "登录成功!",
+			      icon: "none",
+			    });
+			    //获取用户信息
+			    getUserInfo().then((user) => {
+			      storage.setUserInfo(user.data.result);
+			      storage.setHasLogin(true);
+
+			      uni.navigateBack({
+			        delta: 1,
+			      });
+			    });
+			  });
+			},
+
+
+
+
+		},
+	};
 </script>
 <style lang="scss" scoped>
-/*微信授权*/
-page {
-  background-color: #ffffff;
-}
+	/*微信授权*/
+	page {
+		background-color: #ffffff;
+	}
 
-.wx-auth-container {
-  width: 100%;
-  margin-top: 20%;
-}
+	.wx-auth-container {
+		width: 100%;
+		margin-top: 20%;
+	}
 
-.logo-info {
-  display: flex;
-  flex-wrap: nowrap;
-  justify-content: flex-start;
-  flex-direction: row;
-  align-items: flex-start;
-  padding: 20rpx;
+	.logo-info {
+		display: flex;
+		flex-wrap: nowrap;
+		justify-content: flex-start;
+		flex-direction: row;
+		align-items: flex-start;
+		padding: 20rpx;
 
-  flex-direction: column;
-  font-weight: bold;
-}
+		flex-direction: column;
+		font-weight: bold;
+	}
 
-image {
-  width: 100px;
-  height: 100px;
-  text-align: center;
-  -webkit-transform: scale(2.5);
-  transform: scale(2.5);
-}
+	image {
+		width: 100px;
+		height: 100px;
+		text-align: center;
+		-webkit-transform: scale(2.5);
+		transform: scale(2.5);
+	}
 
-.logo-info-img {
-  width: 80rpx;
-  height: 80rpx;
-  border-radius: 50%;
-  border: none;
-}
+	.logo-info-img {
+		width: 80rpx;
+		height: 80rpx;
+		border-radius: 50%;
+		border: none;
+	}
 
-text.title,
-text.shop {
-  display: inline-block;
-  font-size: 60rpx;
-  color: #333;
-}
+	text.title,
+	text.shop {
+		display: inline-block;
+		font-size: 60rpx;
+		color: #333;
+	}
 
-text.shop {
-  display: inline-block;
-  font-size: 55rpx;
-  color: #333;
-}
+	text.shop {
+		display: inline-block;
+		font-size: 55rpx;
+		color: #333;
+	}
 
-.box {
-  margin: 0 32rpx;
-}
+	.box {
+		margin: 0 32rpx;
+	}
 
-/* 文字提示*/
-.small-tips {
-  width: 94%;
-  padding: 20rpx;
-  font-size: 24rpx;
-  margin: 0 0 20rpx;
-  color: #999;
-}
+	/* 文字提示*/
+	.small-tips {
+		width: 94%;
+		padding: 20rpx;
+		font-size: 24rpx;
+		margin: 0 0 20rpx;
+		color: #999;
+	}
 
-.auth-button {
-  padding: 10px 20px;
-  width: calc(100% - 20 * 4rpx);
-}
+	.auth-button {
+		padding: 10px 20px;
+		width: calc(100% - 20 * 4rpx);
+	}
 
-.tips {
-  width: 80%;
-  text-align: left;
-  margin: 6% 10%;
-  margin-top: 48rpx;
-  line-height: 1.75;
-}
+	.tips {
+		width: 80%;
+		text-align: left;
+		margin: 6% 10%;
+		margin-top: 48rpx;
+		line-height: 1.75;
+	}
 
-.register {
-  color: $weChat-color !important;
-  border: none !important;
-  background: #fff !important;
-}
+	.register {
+		color: $weChat-color !important;
+		border: none !important;
+		background: #fff !important;
+	}
 
-.btn-auth {
-  width: 92%;
-  margin: 0 auto 40rpx;
-  border-radius: 100px;
-  // animation: mymove 5s infinite;
-  // -webkit-animation: mymove 5s infinite; /*Safari and Chrome*/
-  // animation-direction: alternate; /*轮流反向播放动画。*/
-  // animation-timing-function: ease-in-out; /*动画的速度曲线*/
-  // /* Safari 和 Chrome */
-  // -webkit-animation: mymove 5s infinite;
-  // -webkit-animation-direction: alternate; /*轮流反向播放动画。*/
-  // -webkit-animation-timing-function: ease-in-out; /*动画的速度曲线*/
-}
-.btn-callback {
-  text-align: center;
-  font-size: 30rpx;
-  background: #ededed;
-  height: 90rpx;
-  line-height: 90rpx;
-  border-radius: 100px;
-  width: 92%;
-  margin: 0 auto;
-}
+	.btn-auth {
+		width: 92%;
+		margin: 0 auto 40rpx;
+		border-radius: 100px;
+		// animation: mymove 5s infinite;
+		// -webkit-animation: mymove 5s infinite; /*Safari and Chrome*/
+		// animation-direction: alternate; /*轮流反向播放动画。*/
+		// animation-timing-function: ease-in-out; /*动画的速度曲线*/
+		// /* Safari 和 Chrome */
+		// -webkit-animation: mymove 5s infinite;
+		// -webkit-animation-direction: alternate; /*轮流反向播放动画。*/
+		// -webkit-animation-timing-function: ease-in-out; /*动画的速度曲线*/
+	}
 
-.btns {
-  margin-top: 100rpx;
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-  justify-content: center;
-}
+	.btn-callback {
+		text-align: center;
+		font-size: 30rpx;
+		background: #ededed;
+		height: 90rpx;
+		line-height: 90rpx;
+		border-radius: 100px;
+		width: 92%;
+		margin: 0 auto;
+	}
 
-@keyframes mymove {
-  0% {
-    transform: scale(1); /*开始为原始大小*/
-  }
-  25% {
-    transform: scale(1.1); /*放大1.1倍*/
-  }
-  50% {
-    transform: scale(1);
-  }
-  75% {
-    transform: scale(1.1);
-  }
-}
+	.btns {
+		margin-top: 100rpx;
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		justify-content: center;
+	}
+
+	@keyframes mymove {
+		0% {
+			transform: scale(1);
+			/*开始为原始大小*/
+		}
+
+		25% {
+			transform: scale(1.1);
+			/*放大1.1倍*/
+		}
+
+		50% {
+			transform: scale(1);
+		}
+
+		75% {
+			transform: scale(1.1);
+		}
+	}
 </style>
diff --git a/pages/tabbar/cart/cartList.vue b/pages/tabbar/cart/cartList.vue
index 2f98c3c..c631e78 100644
--- a/pages/tabbar/cart/cartList.vue
+++ b/pages/tabbar/cart/cartList.vue
@@ -26,7 +26,7 @@
                 @change="checkboxChangeDP(item)"></u-checkbox>
               <!-- #endif -->
             </u-checkbox-group>
-            <span class="store-name store-line-desc" @click.stop="navigateToStore(item)">{{
+            <span class="store-name wes store-line-desc" @click.stop="navigateToStore(item)">{{
               item.storeName 
             }}</span>
             <u-icon @click="navigateToStore(item)"  size="24" style="margin-left:10rpx;"  name="arrow-right"></u-icon>
@@ -740,6 +740,7 @@ page {
   display: flex;
   // #endif
   overflow: hidden;
+  flex:10;
 }
 
 .goods-config {
@@ -758,6 +759,9 @@ page {
 }
 
 .right-col {
+  flex:2;
+  text-align: center;
+  width: 100rpx;
   color: $light-color;
   font-size: 26rpx;
 
diff --git a/pages/tabbar/home/template/fetch_coupon.vue b/pages/tabbar/home/template/fetch_coupon.vue
index fe3d543..15cc5a8 100644
--- a/pages/tabbar/home/template/fetch_coupon.vue
+++ b/pages/tabbar/home/template/fetch_coupon.vue
@@ -100,13 +100,11 @@ export default {
   },
   methods: {
     firstGetAuto() {
+      if(!this.$options.filters.isLogin('auth')) return false
       let data = new Date();
       let now = data.getDate();
       let hours = data.getHours();
       let flagCoup = storage.getAutoCp();
-      console.log(flagCoup);
-      console.log(now);
-
       if (
         storage.getAutoCp() &&
         storage.getAutoCp() != "" &&