From 4cc4c60a873b21237f3920bc37e8765a142e043a Mon Sep 17 00:00:00 2001
From: gaoxs <gaoxs@gaoxsdeMacBook-Pro.local>
Date: Wed, 18 Mar 2020 19:01:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95=E7=9A=84?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/Footer.vue                        |  17 +-
 libs/login.js                                |  63 +-
 libs/wechat.js                               |   2 +-
 pages/activity/GroupDetails/index.vue        |  20 +-
 pages/authorization/index.vue                | 337 ++++---
 pages/home/index.vue                         |   4 +
 pages/launch/index.vue                       |   4 -
 pages/order/OrderDetails/index.vue           |  11 +-
 pages/orderAdmin/OrderCancellation/index.vue |  40 +-
 pages/shop/GoodsCon/index.vue                |   8 -
 pages/shop/ShoppingCart/index.vue            | 967 ++++++++++---------
 pages/user/PersonalData/index.vue            |   5 -
 pages/user/Recharge/index.vue                |   4 +-
 pages/user/User/index.vue                    | 391 ++++----
 pages/user/promotion/Poster/index.vue        |  17 -
 store/index.js                               |  33 +-
 utils/index.js                               | 437 +++++----
 utils/store/cookie.js                        |  45 +-
 18 files changed, 1222 insertions(+), 1183 deletions(-)

diff --git a/components/Footer.vue b/components/Footer.vue
index cbb32ed..dc0d9c3 100644
--- a/components/Footer.vue
+++ b/components/Footer.vue
@@ -1,10 +1,8 @@
 <template>
   <view>
-    <view v-if="isIpx" class="iphonex-footer-bg"></view>
-    <view v-else class="footer-bg"></view>
+    <view class="footer-bg"></view>
     <view id="footer" :class="[isIpx ? 'iphonex-footer' : '', 'acea-row row-middle'] ">
       <view
-        @click="changeTabtar(footerIndex)"
         class="item"
         :class="{ on: footerIndex == tabtarIndex }"
         v-for="(item, footerIndex) in footerList"
@@ -59,20 +57,9 @@ export default {
     ...mapState(["tabtarIndex"])
   },
   methods: {
-    ...mapActions(["changeTabtar"])
   },
   mounted() {
-    let that = this;
-    this.changeTabtar(this.$yroute.query.type);
-    wx.getSystemInfo({
-      success: function(res) {
-        console.log(res);
-        var name = "iPhone X";
-        if (res.model.indexOf(name) > -1) {
-          that.isIpx = true;
-        }
-      }
-    });
+    
   }
 };
 </script>
diff --git a/libs/login.js b/libs/login.js
index 176773f..c4fcebc 100644
--- a/libs/login.js
+++ b/libs/login.js
@@ -1,32 +1,45 @@
 // import router from "../router";
 import store from "../store";
 import cookie from "@/utils/store/cookie";
-import { isWeixin, login, getCurrentPageUrl, getCurrentPageUrlWithArgs, parseQuery, replace, handleQrCode } from "@/utils";
+import {
+	isWeixin,
+	login,
+	replaceLogin,
+	getCurrentPageUrl,
+	getCurrentPageUrlWithArgs,
+	parseQuery,
+	replace,
+	handleQrCode
+} from "@/utils";
 
 export default function toLogin(push, backUrl) {
-  store.commit("LOGOUT");
-  if (store.getters.isAuthorization) {
-    login()
-    return
-  }
-  if (store.getters.isAuthorizationPage || getCurrentPageUrl() == '/pages/user/Login/index') {
-    return
-  }
+	store.commit("LOGOUT");
+	// 如果没有授权，走登录的接口重新授权
+	// 授权获取失败会跳转到授权的接口
+	if (store.getters.isAuthorization) {
+		login()
+		return
+	}
+	// 判断当前是不是已经在登录页面或者授权页，防止二次跳转
+	if (store.getters.isAuthorizationPage || getCurrentPageUrl() == '/pages/user/Login/index') {
+		return
+	}
 
-  // 判断是不是扫描的砍价海报进来的
-  if (getCurrentPageUrl() == 'pages/activity/DargainDetails/index' && handleQrCode()) {
-    let url = handleQrCode();
-    if (url) {
-      console.log(222222222)
-      replace({ path: '/pages/user/Login/index', query: { redirect: `/${getCurrentPageUrl()}`, id: url.bargainId, partake: url.uid } })
-    } else {
-      replace({ path: '/pages/user/Login/index', query: { redirect: `/${getCurrentPageUrl()}`, ...parseQuery() } })
-    }
-  } else {
-    console.log(222222222)
-    replace({ path: '/pages/user/Login/index', query: { redirect: `/${getCurrentPageUrl()}`, ...parseQuery() } })
-  }
-  store.commit("UPDATE_AUTHORIZATION", false);
-  store.commit("UPDATE_AUTHORIZATIONPAGE", true);
+	// 判断是不是扫描的砍价海报进来的
+	if (getCurrentPageUrl() == 'pages/activity/DargainDetails/index' && handleQrCode()) {
+		let url = handleQrCode();
+		if (url) {
+			replaceLogin({
+				redirect: `/${getCurrentPageUrl()}`,
+				id: url.bargainId,
+				partake: url.uid
+			})
+		} else {
+			replaceLogin()
+		}
+	} else {
+		replaceLogin()
+	}
+	store.commit("UPDATE_AUTHORIZATION", false);
+	store.commit("UPDATE_AUTHORIZATIONPAGE", true);
 }
-
diff --git a/libs/wechat.js b/libs/wechat.js
index a09964c..4acb0b4 100644
--- a/libs/wechat.js
+++ b/libs/wechat.js
@@ -2,7 +2,7 @@
 export const weappPay = (option) => {
   return new Promise((resolve, reject) => {
     // 吊起微信支付
-    wx.requestPayment({
+    uni.requestPayment({
       ...option,
       timeStamp: option.timeStamp + '',
       success: (success) => {
diff --git a/pages/activity/GroupDetails/index.vue b/pages/activity/GroupDetails/index.vue
index 6fe60de..aa3817a 100644
--- a/pages/activity/GroupDetails/index.vue
+++ b/pages/activity/GroupDetails/index.vue
@@ -47,7 +47,7 @@
               <view class="lack">
                 <text>还差</text>
                 <text class="font-color-red" v-text="item.count"></text>
-				<text>人成团</text>
+                <text>人成团</text>
               </view>
               <count-down
                 :is-day="false"
@@ -200,7 +200,7 @@ export default {
           cart_num: 1
         }
       },
-      cartNum:1
+      cartNum: 1
     };
   },
   watch: {
@@ -286,11 +286,11 @@ export default {
       var that = this;
       that.attr.productSelect.cart_num = 1;
       that.cartNum = 1;
-       uni.showToast({
-              title: "每人每次限购1" + that.storeInfo.unitName,
-              icon: "none",
-              duration: 2000
-            });
+      uni.showToast({
+        title: "每人每次限购1" + that.storeInfo.unitName,
+        icon: "none",
+        duration: 2000
+      });
     },
     setProductSelect: function() {
       var that = this;
@@ -322,9 +322,9 @@ export default {
           })
           .catch(err => {
             uni.showToast({
-            	title: err.msg || err.response.data.msg,
-            	icon: 'none',
-            	duration: 2000
+              title: err.msg || err.response.data.msg,
+              icon: "none",
+              duration: 2000
             });
           });
       }
diff --git a/pages/authorization/index.vue b/pages/authorization/index.vue
index 459685d..293789b 100644
--- a/pages/authorization/index.vue
+++ b/pages/authorization/index.vue
@@ -1,201 +1,192 @@
 <template>
-	<view class="container">
-		<view v-if="!isAuthorization">
-			<view class="getUserInfo">
-				<view>您还未允许微信登录授权，请点击下方按钮允许微信授权登录。</text>
-					<vant-button type="primary" open-type="getUserInfo" @getuserinfo="getUserInfo">允许微信登录授权</vant-button>
-					<view class="sp-cell"></view>
-					<vant-button type="default" @click="back">取消微信登录授权</vant-button>
-				</view>
-			</view>
-		</view>
-	</view>
+  <view class="container">
+    <view v-if="!isAuthorization">
+      <view class="getUserInfo">
+        <text>您还未允许微信登录授权，请点击下方按钮允许微信授权登录。</text>
+        <view style="height:20rpx"></view>
+        <button type="primary" open-type="getUserInfo" @getuserinfo="getUserInfo">允许微信登录授权</button>
+        <view style="height:20rpx"></view>
+        <button @click="back">取消微信登录授权</button>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	import {
-		mapState,
-		mapMutations,
-		mapActions
-	} from "vuex";
-	// 组件
-	// import request from "@//api/request";
-	import {
-		wxappAuth,
-		getUser
-	} from "@/api/user";
-	import dayjs from "dayjs";
-	import cookie from "@/utils/store/cookie";
-	import {
-		login
-	} from "@/utils";
+import { mapState, mapMutations, mapActions } from "vuex";
+// 组件
+// import request from "@//api/request";
+import { wxappAuth, getUser } from "@/api/user";
+import dayjs from "dayjs";
+import cookie from "@/utils/store/cookie";
+import { login } from "@/utils";
 
-	export default {
-		data() {
-			return {};
-		},
-		computed: {
-			...mapState(["isAuthorization"])
-		},
-		onShow() {
-			this.UPDATE_AUTHORIZATIONPAGE(false);
-		},
-		onHide() {
-			this.changeAuthorization(false);
-		},
-		onUnload() {
-			this.changeAuthorization(false);
-		},
-		methods: {
-			...mapActions(["changeAuthorization", "changeUserInfo"]),
-			...mapMutations(["UPDATE_AUTHORIZATIONPAGE", "CHANGE_TABTAR"]),
-			back() {
-				// if (this.$yroute.query.redirect) {
-				//   this.$yrouter.replace({
-				//     path: this.$yroute.query.redirect
-				//   });
-				// } else {
-				//   this.$yrouter.replace({
-				//     path: "/pages/launch/index",
-				//     query: { type: 0 }
-				//   });
-				// }
-				this.CHANGE_TABTAR(0);
-				this.$yrouter.replace({
-					path: "/pages/home/index",
-					query: {
-						type: 0
-					}
-				});
-			},
-			getUserInfo(data) {
-				uni.showLoading({
-					title: "登录中"
-				});
-				login();
-			}
-		},
-		onUnload() {},
-		mounted() {}
-	};
+export default {
+  data() {
+    return {};
+  },
+  computed: {
+    ...mapState(["isAuthorization"])
+  },
+  onShow() {
+    this.UPDATE_AUTHORIZATIONPAGE(true);
+  },
+  onHide() {
+    this.UPDATE_AUTHORIZATIONPAGE(false);
+    this.changeAuthorization(false);
+  },
+  onUnload() {
+    this.UPDATE_AUTHORIZATIONPAGE(false);
+    this.changeAuthorization(false);
+  },
+  methods: {
+    ...mapActions(["changeAuthorization", "changeUserInfo"]),
+    ...mapMutations(["UPDATE_AUTHORIZATIONPAGE", "CHANGE_TABTAR"]),
+    back() {
+      this.$yrouter.switchTab({
+        path: "/pages/home/index",
+        query: {}
+      });
+    },
+    getUserInfo(data) {
+      if (data.detail.errMsg == "getUserInfo:fail auth deny") {
+        uni.showToast({
+          title: "取消授权",
+          icon: "none",
+          duration: 2000
+        });
+        return;
+      }
+      uni.showLoading({
+        title: "登录中"
+      });
+      login({
+        success: () => {}
+      });
+    }
+  },
+  onUnload() {},
+  mounted() {}
+};
 </script>
 
 <style lang="less">
-	.sp-cell {
-		height: 20rpx;
-	}
+.sp-cell {
+  height: 20rpx;
+}
 
-	.getUserInfo {
-		display: flex;
-		align-items: center;
-		flex-direction: column;
-		padding: 30px;
+.getUserInfo {
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+  padding: 30px;
 
-		p {
-			margin-bottom: 20px;
-		}
-	}
+  p {
+    margin-bottom: 20px;
+  }
+}
 
-	.container {
-		flex: 1;
-		display: flex;
-		flex-direction: column;
-		justify-content: flex-start;
-		position: relative;
-	}
+.container {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+  position: relative;
+}
 
-	.tab-bar {
-		font-size: 0;
-		display: flex;
-		align-items: center;
-		background: rgba(255, 255, 255, 0.9);
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		right: 0;
-		z-index: 99;
-		border-top: 1px solid rgba(248, 248, 248, 1);
+.tab-bar {
+  font-size: 0;
+  display: flex;
+  align-items: center;
+  background: rgba(255, 255, 255, 0.9);
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  z-index: 99;
+  border-top: 1px solid rgba(248, 248, 248, 1);
 
-		.tab-bar-item {
-			flex: 1;
-			height: 49px;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			flex-direction: column;
+  .tab-bar-item {
+    flex: 1;
+    height: 49px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-direction: column;
 
-			&.active {
-				text {
-					color: #ee7559;
-				}
+    &.active {
+      text {
+        color: #ee7559;
+      }
 
-				.tab-bar-pic {
-					display: none;
-					background: #f9f9f9;
+      .tab-bar-pic {
+        display: none;
+        background: #f9f9f9;
 
-					&.active {
-						display: block;
-					}
-				}
-			}
+        &.active {
+          display: block;
+        }
+      }
+    }
 
-			.tab-bar-pic {
-				display: block;
-				background: #f9f9f9;
+    .tab-bar-pic {
+      display: block;
+      background: #f9f9f9;
 
-				&.active {
-					display: none;
-				}
-			}
-		}
+      &.active {
+        display: none;
+      }
+    }
+  }
 
-		.tab-bar-pic {
-			width: 25px;
-			height: 25px;
-			background: #f9f9f9;
+  .tab-bar-pic {
+    width: 25px;
+    height: 25px;
+    background: #f9f9f9;
 
-			image {
-				width: 25px;
-				height: 25px;
-			}
-		}
+    image {
+      width: 25px;
+      height: 25px;
+    }
+  }
 
-		.tab-bar-pic-active {}
+  .tab-bar-pic-active {
+  }
 
-		text {
-			font-size: 10px;
-			color: rgb(160, 160, 160);
-			line-height: 10px;
-			margin-top: 5px;
-		}
-	}
+  text {
+    font-size: 10px;
+    color: rgb(160, 160, 160);
+    line-height: 10px;
+    margin-top: 5px;
+  }
+}
 
-	.tab-bar-bg {
-		padding-top: 46px;
-		width: 100%;
-	}
+.tab-bar-bg {
+  padding-top: 46px;
+  width: 100%;
+}
 
-	.view-item {
-		display: none;
-		width: 100%;
-	}
+.view-item {
+  display: none;
+  width: 100%;
+}
 
-	.view-item-active {
-		display: block;
-	}
+.view-item-active {
+  display: block;
+}
 
-	.getUserInfo {
-		display: flex;
-		align-items: center;
-		flex-direction: column;
-		padding: 30px;
+.getUserInfo {
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+  padding: 30px;
 
-		p {
-			margin-bottom: 20px;
-		}
-	}
+  p {
+    margin-bottom: 20px;
+  }
+}
 
-	._van-dialog {
-		z-index: 99999999999;
-	}
-</style>
+._van-dialog {
+  z-index: 99999999999;
+}
+</style>
diff --git a/pages/home/index.vue b/pages/home/index.vue
index db3ce5a..bed19d5 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -254,6 +254,9 @@ export default {
   },
   mounted: function() {
     let that = this;
+    uni.showLoading({
+      title:'加载中'
+    })
     getHomeData().then(res => {
       that.logoUrl = res.data.logoUrl;
       that.$set(that, "banner", res.data.banner);
@@ -269,6 +272,7 @@ export default {
       that.$set(that, "lovely", res.data.lovely);
       that.$set(that, "benefit", res.data.benefit);
       that.$set(that, "couponList", res.data.couponList);
+      uni.hideLoading()
       that.setOpenShare();
     });
   },
diff --git a/pages/launch/index.vue b/pages/launch/index.vue
index 3564c54..4e63206 100644
--- a/pages/launch/index.vue
+++ b/pages/launch/index.vue
@@ -43,22 +43,18 @@ export default {
     ...mapState(["tabtarIndex"])
   },
   methods: {
-    ...mapActions(["changeTabtar"])
   },
   mounted() {
     let type = this.$yroute.query.type;
     console.log(2222)
     if (type) {
-      this.changeTabtar(type);
     }
 	
     // if (!this.tabtarIndex) {
-    //   this.changeTabtar(0);
     // }
   },
   onHide() {
     console.log("清除状态");
-    // this.changeTabtar(0);
   }
 };
 </script>
diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue
index 79578c2..600710c 100644
--- a/pages/order/OrderDetails/index.vue
+++ b/pages/order/OrderDetails/index.vue
@@ -495,7 +495,8 @@
 		},
 		methods: {
 			copyClipboard,
-			showChang: function() {
+			showChang: function() {
+				// 这里判断是不是微信小程序
 				if (isWeixin()) {
 					let config = {
 						latitude: this.system_store.latitude,
@@ -503,14 +504,6 @@
 						name: this.system_store.name,
 						address: this.system_store._detailed_address
 					};
-					// wechatEvevt("openLocation", config)
-					//   .then(res => {
-					//   })
-					//   .catch(res => {
-					//     if (res.is_ready) {
-					//       res.wx.openLocation(config);
-					//     }
-					//   });
 				} else {
 					if (!this.mapKey)
 						uni.showToast({
diff --git a/pages/orderAdmin/OrderCancellation/index.vue b/pages/orderAdmin/OrderCancellation/index.vue
index efe2991..451ff5a 100644
--- a/pages/orderAdmin/OrderCancellation/index.vue
+++ b/pages/orderAdmin/OrderCancellation/index.vue
@@ -151,44 +151,8 @@
 					});
 			},
 			openQRCode: function() {
-				let that = this;
-				// wechatEvevt("scanQRCode", {
-				//   needResult: 1,
-				//   scanType: ["qrCode", "barCode"]
-				// })
-				//   .then(res => {
-				//     if (res.resultStr) {
-				//       that.verify_code = res.resultStr;
-				//       that.storeCancellation();
-				//     } else {
-				//        uni.showToast({
-				//                     title: '没有扫描到什么！',
-				//                     icon: "none",
-				//                     duration: 2000
-				//                   });
-				//     }
-				//   })
-				//   .catch(res => {
-				//     if (res.is_ready) {
-				//       res.wx.scanQRCode({
-				//         needResult: 1,
-				//         scanType: ["qrCode", "barCode"],
-				//         success: function(res) {
-				//           that.verify_code = res.resultStr;
-				//           that.storeCancellation();
-				//         },
-				//         fail: function(res) {
-				//           if (res.errMsg == "scanQRCode:permission denied") {
-				//              uni.showToast({
-				//                     title: '没有权限',
-				//                     icon: "none",
-				//                     duration: 2000
-				//                   });
-				//           }
-				//         }
-				//       });
-				//     }
-				//   });
+				let that = this;
+				// 这里需要调用扫码功能
 			}
 		}
 	};
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index 683fd5c..6a02bd4 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -288,14 +288,6 @@ export default {
           name: this.system_store.name,
           address: this.system_store._detailed_address
         };
-        // wechatEvevt("openLocation", config)
-        //   .then(res => {
-        //   })
-        //   .catch(res => {
-        //     if (res.is_ready) {
-        //       res.wx.openLocation(config);
-        //     }
-        //   });
       } else {
         if (!this.mapKey) {
           uni.showToast({
diff --git a/pages/shop/ShoppingCart/index.vue b/pages/shop/ShoppingCart/index.vue
index f306f90..011eeb8 100644
--- a/pages/shop/ShoppingCart/index.vue
+++ b/pages/shop/ShoppingCart/index.vue
@@ -1,98 +1,135 @@
 <template>
-	<view class="shoppingCart">
-		<view class="labelNav acea-row row-around row-middle">
-			<view class="item">
-				<text class="iconfont icon-xuanzhong"></text>100%正品保证
-			</view>
-			<view class="item">
-				<text class="iconfont icon-xuanzhong"></text>所有商品精挑细选
-			</view>
-			<view class="item">
-				<text class="iconfont icon-xuanzhong"></text>售后无忧
-			</view>
-		</view>
-		<view class="nav acea-row row-between-wrapper">
-			<view>
-				购物数量
-				<text class="num font-color-red">{{ count }}</text>
-			</view>
-			<view v-if="cartList.valid.length > 0" class="administrate acea-row row-center-wrapper" @click="manage">{{ footerswitch ? "取消" : "管理" }}</view>
-		</view>
-		<view v-if="validList.length > 0 || cartList.invalid.length > 0">
-			<view class="list">
-				<view class="item acea-row row-between-wrapper" v-for="(item, cartListValidIndex) in validList" :key="cartListValidIndex">
-					<view class="select-btn">
-						<view class="checkbox-wrapper">
-							<checkbox-group @change="switchSelect(cartListValidIndex)">
-								<label class="well-check">
-									<checkbox value :checked="item.checked"></checkbox>
-								</label>
-							</checkbox-group>
-						</view>
-					</view>
-					<view class="picTxt acea-row row-between-wrapper">
-						<view class="pictrue" @click="goGoodsCon(item)">
-							<image :src="item.productInfo.attrInfo.image" v-if="item.productInfo.attrInfo" />
-							<image :src="item.productInfo.image" v-else />
-						</view>
-						<view class="text">
-							<view class="line1">{{ item.productInfo.storeName }}</view>
-							<view class="infor line1" v-if="item.productInfo.attrInfo">属性：{{ item.productInfo.attrInfo.suk }}</view>
-							<view class="money">￥{{ item.truePrice }}</view>
-						</view>
-						<view class="carnum acea-row row-center-wrapper">
-							<view class="reduce" :class="validList[cartListValidIndex].cartNum <= 1 ? 'on' : ''" @click.prevent="reduce(cartListValidIndex)">-</view>
-							<view class="num">{{ item.cartNum }}</view>
-							<view class="plus" v-if="validList[cartListValidIndex].attrInfo" :class="validList[cartListValidIndex].cartNum >=validList[cartListValidIndex].attrInfo.stock? 'on': ''"
-							 @click.prevent="plus(cartListValidIndex)">+</view>
-							<view class="plus" v-else :class="validList[cartListValidIndex].cartNum >= validList[cartListValidIndex].stock? 'on': ''"
-							 @click.prevent="plus(cartListValidIndex)">+</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="invalidGoods" v-if="cartList.invalid.length > 0">
-				<view class="goodsNav acea-row row-between-wrapper">
-					<view @click="goodsOpen">
-						<text class="iconfont" :class="goodsHidden === true ? 'icon-xiangyou' : 'icon-xiangxia'"></text>失效商品
-					</view>
-					<view class="del" @click="delInvalidGoods">
-						<text class="iconfont icon-shanchu1"></text>清空
-					</view>
-				</view>
-				<view class="goodsList" :hidden="goodsHidden">
-					<view v-for="(item, cartListinvalidIndex) in cartList.invalid" :key="cartListinvalidIndex">
-						<view @click="goGoodsCon(item)" class="item acea-row row-between-wrapper" v-if="item.productInfo">
-							<view class="invalid acea-row row-center-wrapper">失效</view>
-							<view class="pictrue">
-								<image :src="item.productInfo.attrInfo.image" v-if="item.productInfo.attrInfo" />
-								<image :src="item.productInfo.image" v-else />
-							</view>
-							<view class="text acea-row row-column-between">
-								<view class="line1">{{ item.productInfo.storeName }}</view>
-								<view class="infor line1" v-if="item.productInfo.attrInfo">属性：{{ item.productInfo.attrInfo.suk }}</view>
-								<view class="acea-row row-between-wrapper">
-									<view class="end">该商品已下架</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<!--购物车暂无商品-->
-		<view class="noCart" v-if="cartList.valid.length === 0 && cartList.invalid.length === 0">
-			<view class="pictrue">
-				<image :src="$VUE_APP_RESOURCES_URL+'/images/noCart.png'" />
-			</view>
-			<Recommend></Recommend>
-		</view>
-		<view style="height:2.1rem"></view>
-		<view :class="['footer acea-row row-between-wrapper']" v-if="cartList.valid.length > 0">
-			<view>
-				<view class="select-btn">
-					<view class="checkbox-wrapper">
-						<!-- <label class="well-check">
+  <view class="shoppingCart">
+    <view class v-if="userInfo.uid">
+      <view class="labelNav acea-row row-around row-middle">
+        <view class="item">
+          <text class="iconfont icon-xuanzhong"></text>100%正品保证
+        </view>
+        <view class="item">
+          <text class="iconfont icon-xuanzhong"></text>所有商品精挑细选
+        </view>
+        <view class="item">
+          <text class="iconfont icon-xuanzhong"></text>售后无忧
+        </view>
+      </view>
+      <view class="nav acea-row row-between-wrapper">
+        <view>
+          购物数量
+          <text class="num font-color-red">{{ count }}</text>
+        </view>
+        <view
+          v-if="cartList.valid.length > 0"
+          class="administrate acea-row row-center-wrapper"
+          @click="manage"
+        >{{ footerswitch ? "取消" : "管理" }}</view>
+      </view>
+      <view v-if="validList.length > 0 || cartList.invalid.length > 0">
+        <view class="list">
+          <view
+            class="item acea-row row-between-wrapper"
+            v-for="(item, cartListValidIndex) in validList"
+            :key="cartListValidIndex"
+          >
+            <view class="select-btn">
+              <view class="checkbox-wrapper">
+                <checkbox-group @change="switchSelect(cartListValidIndex)">
+                  <label class="well-check">
+                    <checkbox value :checked="item.checked"></checkbox>
+                  </label>
+                </checkbox-group>
+              </view>
+            </view>
+            <view class="picTxt acea-row row-between-wrapper">
+              <view class="pictrue" @click="goGoodsCon(item)">
+                <image :src="item.productInfo.attrInfo.image" v-if="item.productInfo.attrInfo" />
+                <image :src="item.productInfo.image" v-else />
+              </view>
+              <view class="text">
+                <view class="line1">{{ item.productInfo.storeName }}</view>
+                <view
+                  class="infor line1"
+                  v-if="item.productInfo.attrInfo"
+                >属性：{{ item.productInfo.attrInfo.suk }}</view>
+                <view class="money">￥{{ item.truePrice }}</view>
+              </view>
+              <view class="carnum acea-row row-center-wrapper">
+                <view
+                  class="reduce"
+                  :class="validList[cartListValidIndex].cartNum <= 1 ? 'on' : ''"
+                  @click.prevent="reduce(cartListValidIndex)"
+                >-</view>
+                <view class="num">{{ item.cartNum }}</view>
+                <view
+                  class="plus"
+                  v-if="validList[cartListValidIndex].attrInfo"
+                  :class="validList[cartListValidIndex].cartNum >=validList[cartListValidIndex].attrInfo.stock? 'on': ''"
+                  @click.prevent="plus(cartListValidIndex)"
+                >+</view>
+                <view
+                  class="plus"
+                  v-else
+                  :class="validList[cartListValidIndex].cartNum >= validList[cartListValidIndex].stock? 'on': ''"
+                  @click.prevent="plus(cartListValidIndex)"
+                >+</view>
+              </view>
+            </view>
+          </view>
+        </view>
+        <view class="invalidGoods" v-if="cartList.invalid.length > 0">
+          <view class="goodsNav acea-row row-between-wrapper">
+            <view @click="goodsOpen">
+              <text
+                class="iconfont"
+                :class="goodsHidden === true ? 'icon-xiangyou' : 'icon-xiangxia'"
+              ></text>失效商品
+            </view>
+            <view class="del" @click="delInvalidGoods">
+              <text class="iconfont icon-shanchu1"></text>清空
+            </view>
+          </view>
+          <view class="goodsList" :hidden="goodsHidden">
+            <view
+              v-for="(item, cartListinvalidIndex) in cartList.invalid"
+              :key="cartListinvalidIndex"
+            >
+              <view
+                @click="goGoodsCon(item)"
+                class="item acea-row row-between-wrapper"
+                v-if="item.productInfo"
+              >
+                <view class="invalid acea-row row-center-wrapper">失效</view>
+                <view class="pictrue">
+                  <image :src="item.productInfo.attrInfo.image" v-if="item.productInfo.attrInfo" />
+                  <image :src="item.productInfo.image" v-else />
+                </view>
+                <view class="text acea-row row-column-between">
+                  <view class="line1">{{ item.productInfo.storeName }}</view>
+                  <view
+                    class="infor line1"
+                    v-if="item.productInfo.attrInfo"
+                  >属性：{{ item.productInfo.attrInfo.suk }}</view>
+                  <view class="acea-row row-between-wrapper">
+                    <view class="end">该商品已下架</view>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+      <!--购物车暂无商品-->
+      <view class="noCart" v-if="cartList.valid.length === 0 && cartList.invalid.length === 0">
+        <view class="pictrue">
+          <image :src="$VUE_APP_RESOURCES_URL+'/images/noCart.png'" />
+        </view>
+        <Recommend></Recommend>
+      </view>
+      <view style="height:2.1rem"></view>
+      <view :class="['footer acea-row row-between-wrapper']" v-if="cartList.valid.length > 0">
+        <view>
+          <view class="select-btn">
+            <view class="checkbox-wrapper">
+              <!-- <label class="well-check">
               <input
                 type="checkbox"
                 name
@@ -102,377 +139,385 @@
               />
               <i class="icon"></i>
               <text class="checkAll">全选 ({{ cartCount }})</text>
-            </label>-->
+              </label>-->
 
-						<checkbox-group @change="allChecked">
-							<label class="well-check">
-								<checkbox value :checked="isAllSelect && cartCount > 0"></checkbox>
-								<text class="checkAll">全选 ({{ cartCount }})</text>
-							</label>
-						</checkbox-group>
-					</view>
-				</view>
-			</view>
-			<view class="money acea-row row-middle" v-if="footerswitch === false">
-				<text class="font-color-red">￥{{ countmoney }}</text>
-				<view class="placeOrder bg-color-red" @click="placeOrder">立即下单</view>
-			</view>
-			<view class="button acea-row row-middle" v-else>
-				<view class="bnt cart-color" @click="collectAll">收藏</view>
-				<view class="bnt" @click="delgoods">删除</view>
-			</view>
-		</view>
-	</view>
+              <checkbox-group @change="allChecked">
+                <label class="well-check">
+                  <checkbox value :checked="isAllSelect && cartCount > 0"></checkbox>
+                  <text class="checkAll">全选 ({{ cartCount }})</text>
+                </label>
+              </checkbox-group>
+            </view>
+          </view>
+        </view>
+        <view class="money acea-row row-middle" v-if="footerswitch === false">
+          <text class="font-color-red">￥{{ countmoney }}</text>
+          <view class="placeOrder bg-color-red" @click="placeOrder">立即下单</view>
+        </view>
+        <view class="button acea-row row-middle" v-else>
+          <view class="bnt cart-color" @click="collectAll">收藏</view>
+          <view class="bnt" @click="delgoods">删除</view>
+        </view>
+      </view>
+    </view>
+    <Authorization v-else />
+  </view>
 </template>
 <script>
-	import Recommend from "@/components/Recommend";
-	import {
-		getCartList,
-		postCartDel,
-		changeCartNum,
-		getCartCount
-	} from "@/api/store";
-	import {
-		postCollectAll
-	} from "@/api/user";
-	import {
-		mul,
-		add
-	} from "@/utils/bc";
-	import cookie from "@/utils/store/cookie";
-	import debounce from "lodash.debounce";
+import Recommend from "@/components/Recommend";
+import Authorization from "@/pages/authorization/index";
+import { mapGetters } from "vuex";
 
-	const CHECKED_IDS = "cart_checked";
+import {
+  getCartList,
+  postCartDel,
+  changeCartNum,
+  getCartCount
+} from "@/api/store";
+import { postCollectAll } from "@/api/user";
+import { mul, add } from "@/utils/bc";
+import cookie from "@/utils/store/cookie";
+import debounce from "lodash.debounce";
 
-	export default {
-		name: "ShoppingCart",
-		components: {
-			Recommend
-		},
-		props: {},
-		data: function() {
-			return {
-				isIpx: false,
-				cartList: {
-					invalid: [],
-					valid: []
-				},
-				validList: [],
-				isAllSelect: false,
-				cartCount: 0,
-				countmoney: 0,
-				goodsHidden: true,
-				footerswitch: false,
-				count: 0,
-				checkedIds: [],
-				loaded: false
-			};
-		},
-		watch: {
-			$yroute(n) {
-				if (n.name === "ShoppingCart") {
-					this.carnum();
-					this.countMoney();
-					this.getCartList();
-					this.gainCount();
-					this.goodsHidden = true;
-					this.footerswitch = false;
-				}
-			},
-			cartList(list) {
-				this.validList = list.valid;
-			}
-		},
-		mounted: function() {
-			let that = this;
-			that.carnum();
-			that.countMoney();
-			that.getCartList();
-			that.gainCount();
-			wx.getSystemInfo({
-				success: function(res) {
-					console.log(res);
-					var name = "iPhone X";
-					if (res.model.indexOf(name) > -1) {
-						that.isIpx = true;
-					}
-				}
-			});
-		},
-		methods: {
-			goGoodsCon(item) {
-				this.$yrouter.push({
-					path: "/pages/shop/GoodsCon/index",
-					query: {
-						id: item.productId
-					}
-				});
-			},
-			getCartList: function() {
-				let that = this;
-				getCartList().then(res => {
-					that.cartList = res.data;
-					let checkedIds = cookie.get(CHECKED_IDS) || [];
-					if (!Array.isArray(checkedIds)) checkedIds = [];
-					this.cartList.valid.forEach(cart => {
-						if (checkedIds.indexOf(cart.id) !== -1) cart.checked = true;
-					});
-					if (checkedIds.length) {
-						that.checkedIds = checkedIds;
-						that.isAllSelect = checkedIds.length === this.cartList.valid.length;
-						that.carnum();
-						that.countMoney();
-					}
-					this.loaded = true;
-				});
-			},
-			//删除商品；
-			delgoods: function() {
-				let that = this,
-					id = [],
-					valid = [],
-					list = that.cartList.valid;
-				list.forEach(function(val) {
-					if (val.checked === true) {
-						id.push(val.id);
-					}
-				});
-				if (id.length === 0) {
-           uni.showToast({
-              title: "请选择产品",
-              icon: "none",
-              duration: 2000
-            });
-					return;
-				}
-				postCartDel(id).then(function() {
-					list.forEach(function(val, i) {
-						if (val.checked === false || val.checked === undefined)
-							valid.push(list[i]);
-					});
-					that.$set(that.cartList, "valid", valid);
-					that.carnum();
-					that.countMoney();
-					that.gainCount();
-					that.getCartList();
-				});
-			},
-			// //获取数量
-			gainCount: function() {
-				let that = this;
-				getCartCount().then(res => {
-					that.count = res.data.count;
-				});
-			},
-			//清除失效产品；
-			delInvalidGoods: function() {
-				let that = this,
-					id = [],
-					list = that.cartList.invalid;
-				list.forEach(function(val) {
-					id.push(val.id);
-				});
-				postCartDel(id).then(function() {
-					list.splice(0, list.length);
-					that.gainCount();
-					that.getCartList();
-				});
-			},
-			//批量收藏;
-			collectAll: function() {
-				let that = this,
-					data = {
-						id: [],
-						category: ""
-					},
-					list = that.cartList.valid;
-				list.forEach(function(val) {
-					if (val.checked === true) {
-						data.id.push(val.product_id);
-						data.category = val.type;
-					}
-				});
-				if (data.id.length === 0) {
-           uni.showToast({
-              title: "请选择产品",
-              icon: "none",
-              duration: 2000
-            });
-					return;
-				}
-				postCollectAll(data).then(function() {
-           uni.showToast({
-              title: "收藏成功!",
-              icon: "none",
-              duration: 2000
-            });
-				});
-			},
-			//立即下单；
-			placeOrder: function() {
-				let that = this,
-					list = that.cartList.valid,
-					id = [];
-				list.forEach(function(val) {
-					if (val.checked === true) {
-						id.push(val.id);
-					}
-				});
-				if (id.length === 0) {
-           uni.showToast({
-              title: "请选择产品",
-              icon: "none",
-              duration: 2000
-            });
-					return;
-				}
-				console.log(id);
-				this.$yrouter.push({
-					path: "/pages/order/OrderSubmission/index",
-					query: {
-						id: id.join(",")
-					}
-				});
-			},
-			manage: function() {
-				let that = this;
-				that.footerswitch = !that.footerswitch;
-			},
-			goodsOpen: function() {
-				let that = this;
-				that.goodsHidden = !that.goodsHidden;
-			},
-			//加
-			plus: function(index) {
-				let that = this;
-				let list = that.cartList.valid[index];
-				list.cartNum++;
-				if (list.attrInfo) {
-					if (list.cartNum >= list.attrInfo.stock) {
-						that.$set(list, "cart_num", list.attrInfo.stock);
-					}
-				} else {
-					if (list.cartNum >= list.stock) {
-						that.$set(list, "cart_num", list.stock);
-					}
-				}
-				that.carnum();
-				that.countMoney();
-				that.syncCartNum(list);
-			},
-			//减
-			reduce: function(index) {
-				let that = this;
-				let list = that.cartList.valid[index];
-				if (list.cartNum <= 1) {
-           uni.showToast({
-              title: "已经是底线啦!",
-              icon: "none",
-              duration: 2000
-            });
-					return;
-				}
-				list.cartNum--;
-				if (list.cartNum < 1) {
-					that.$set(list, "cart_num", 1);
-				}
-				that.carnum();
-				that.countMoney();
-				that.syncCartNum(list);
-			},
-			syncCartNum(cart) {
-				if (!cart.sync) {
-					changeCartNum(cart.id, Math.max(cart.cartNum, 1) || 1)
-						.then(res => {
-							this.getCartList();
-						})
-						.catch(error => {
-							uni.showToast({
-								title: error.response.data.msg,
-								icon: "none",
-								duration: 2000
-							});
-						});
-				}
-			},
-			//单选
-			switchSelect: function(index) {
-				let that = this,
-					cart = that.cartList.valid[index],
-					i = this.checkedIds.indexOf(cart.id);
-				cart.checked = !cart.checked;
+const CHECKED_IDS = "cart_checked";
 
-				if (i !== -1) this.checkedIds.splice(i, 1);
-				if (cart.checked) {
-					this.checkedIds.push(cart.id);
-				}
-				let len = that.cartList.valid.length;
-				let selectnum = [];
-				for (let i = 0; i < len; i++) {
-					if (that.cartList.valid[i].checked === true) {
-						selectnum.push(true);
-					}
-				}
-				that.isAllSelect = selectnum.length === len;
-				that.$set(that, "cartList", that.cartList);
-				that.$set(that, "isAllSelect", that.isAllSelect);
-				cookie.set(CHECKED_IDS, that.checkedIds);
-				that.carnum();
-				that.countMoney();
-			},
-			//全选
-			allChecked: function(e) {
-				let that = this;
-				let selectAllStatus = e.mp.detail.value[0] ? true : false;
-				// let selectAllStatus = that.isAllSelect;
-				let checkedIds = [];
-				// for (let i = 0; i < array.length; i++) {
-				//   array[i].checked = selectAllStatus;
-				//   checked.push()
-				// }
-				that.cartList.valid.forEach(cart => {
-					cart.checked = selectAllStatus;
-					if (selectAllStatus) {
-						checkedIds.push(cart.id);
-					}
-				});
-				let cartList = {
-					...that.cartList
-				};
-				that.cartList = [];
-				that.cartList = cartList;
-				this.$set(this, "cartList", this.cartList);
-				this.$set(this, "isAllSelect", selectAllStatus);
-				this.checkedIds = checkedIds;
-				cookie.set(CHECKED_IDS, checkedIds);
-				that.carnum();
-				that.countMoney();
-				this.$forceUpdate();
-			},
-			//数量
-			carnum: function() {
-				let that = this;
-				var carnum = 0;
-				var array = that.cartList.valid;
-				for (let i = 0; i < array.length; i++) {
-					if (array[i].checked === true) {
-						carnum += parseInt(array[i].cartNum);
-					}
-				}
-				that.$set(that, "cartCount", carnum);
-			},
-			//总共价钱；
-			countMoney: function() {
-				let that = this;
-				let carmoney = 0;
-				let array = that.cartList.valid;
-				for (let i = 0; i < array.length; i++) {
-					if (array[i].checked === true) {
-						carmoney = add(carmoney, mul(array[i].cartNum, array[i].truePrice));
-					}
-				}
-				that.countmoney = carmoney;
-			}
-		}
-	};
+export default {
+  name: "ShoppingCart",
+  components: {
+    Recommend,
+    Authorization
+  },
+  props: {},
+  data: function() {
+    return {
+      cartList: {
+        invalid: [],
+        valid: []
+      },
+      validList: [],
+      isAllSelect: false,
+      cartCount: 0,
+      countmoney: 0,
+      goodsHidden: true,
+      footerswitch: false,
+      count: 0,
+      checkedIds: [],
+      loaded: false
+    };
+  },
+  computed: mapGetters(["userInfo"]),
+
+  //   watch: {
+  //     $yroute(n) {
+  //       if (n.name === "ShoppingCart") {
+  //         this.carnum();
+  //         this.countMoney();
+  //         this.getCartList();
+  //         this.gainCount();
+  //         this.goodsHidden = true;
+  //         this.footerswitch = false;
+  //       }
+  //     },
+  //     cartList(list) {
+  //       this.validList = list.valid;
+  //     }
+  //   },
+  watch: {
+    userInfo(user) {
+      console.log(user);
+      if (user.uid) {
+        this.carnum();
+        this.countMoney();
+        this.getCartList();
+        this.gainCount();
+      }
+    },
+    cartList(list) {
+      this.validList = list.valid;
+    }
+  },
+  onShow: function() {
+    if (this.userInfo.uid) {
+      this.carnum();
+      this.countMoney();
+      this.getCartList();
+      this.gainCount();
+    }
+  },
+  methods: {
+    goGoodsCon(item) {
+      this.$yrouter.push({
+        path: "/pages/shop/GoodsCon/index",
+        query: {
+          id: item.productId
+        }
+      });
+    },
+    getCartList: function() {
+      let that = this;
+      getCartList().then(res => {
+        that.cartList = res.data;
+        let checkedIds = cookie.get(CHECKED_IDS) || [];
+        if (!Array.isArray(checkedIds)) checkedIds = [];
+        this.cartList.valid.forEach(cart => {
+          if (checkedIds.indexOf(cart.id) !== -1) cart.checked = true;
+        });
+        if (checkedIds.length) {
+          that.checkedIds = checkedIds;
+          that.isAllSelect = checkedIds.length === this.cartList.valid.length;
+          that.carnum();
+          that.countMoney();
+        }
+        this.loaded = true;
+      });
+    },
+    //删除商品；
+    delgoods: function() {
+      let that = this,
+        id = [],
+        valid = [],
+        list = that.cartList.valid;
+      list.forEach(function(val) {
+        if (val.checked === true) {
+          id.push(val.id);
+        }
+      });
+      if (id.length === 0) {
+        uni.showToast({
+          title: "请选择产品",
+          icon: "none",
+          duration: 2000
+        });
+        return;
+      }
+      postCartDel(id).then(function() {
+        list.forEach(function(val, i) {
+          if (val.checked === false || val.checked === undefined)
+            valid.push(list[i]);
+        });
+        that.$set(that.cartList, "valid", valid);
+        that.carnum();
+        that.countMoney();
+        that.gainCount();
+        that.getCartList();
+      });
+    },
+    // //获取数量
+    gainCount: function() {
+      let that = this;
+      getCartCount().then(res => {
+        that.count = res.data.count;
+      });
+    },
+    //清除失效产品；
+    delInvalidGoods: function() {
+      let that = this,
+        id = [],
+        list = that.cartList.invalid;
+      list.forEach(function(val) {
+        id.push(val.id);
+      });
+      postCartDel(id).then(function() {
+        list.splice(0, list.length);
+        that.gainCount();
+        that.getCartList();
+      });
+    },
+    //批量收藏;
+    collectAll: function() {
+      let that = this,
+        data = {
+          id: [],
+          category: ""
+        },
+        list = that.cartList.valid;
+      list.forEach(function(val) {
+        if (val.checked === true) {
+          data.id.push(val.product_id);
+          data.category = val.type;
+        }
+      });
+      if (data.id.length === 0) {
+        uni.showToast({
+          title: "请选择产品",
+          icon: "none",
+          duration: 2000
+        });
+        return;
+      }
+      postCollectAll(data).then(function() {
+        uni.showToast({
+          title: "收藏成功!",
+          icon: "none",
+          duration: 2000
+        });
+      });
+    },
+    //立即下单；
+    placeOrder: function() {
+      let that = this,
+        list = that.cartList.valid,
+        id = [];
+      list.forEach(function(val) {
+        if (val.checked === true) {
+          id.push(val.id);
+        }
+      });
+      if (id.length === 0) {
+        uni.showToast({
+          title: "请选择产品",
+          icon: "none",
+          duration: 2000
+        });
+        return;
+      }
+      console.log(id);
+      this.$yrouter.push({
+        path: "/pages/order/OrderSubmission/index",
+        query: {
+          id: id.join(",")
+        }
+      });
+    },
+    manage: function() {
+      let that = this;
+      that.footerswitch = !that.footerswitch;
+    },
+    goodsOpen: function() {
+      let that = this;
+      that.goodsHidden = !that.goodsHidden;
+    },
+    //加
+    plus: function(index) {
+      let that = this;
+      let list = that.cartList.valid[index];
+      list.cartNum++;
+      if (list.attrInfo) {
+        if (list.cartNum >= list.attrInfo.stock) {
+          that.$set(list, "cart_num", list.attrInfo.stock);
+        }
+      } else {
+        if (list.cartNum >= list.stock) {
+          that.$set(list, "cart_num", list.stock);
+        }
+      }
+      that.carnum();
+      that.countMoney();
+      that.syncCartNum(list);
+    },
+    //减
+    reduce: function(index) {
+      let that = this;
+      let list = that.cartList.valid[index];
+      if (list.cartNum <= 1) {
+        uni.showToast({
+          title: "已经是底线啦!",
+          icon: "none",
+          duration: 2000
+        });
+        return;
+      }
+      list.cartNum--;
+      if (list.cartNum < 1) {
+        that.$set(list, "cart_num", 1);
+      }
+      that.carnum();
+      that.countMoney();
+      that.syncCartNum(list);
+    },
+    syncCartNum(cart) {
+      if (!cart.sync) {
+        changeCartNum(cart.id, Math.max(cart.cartNum, 1) || 1)
+          .then(res => {
+            this.getCartList();
+          })
+          .catch(error => {
+            uni.showToast({
+              title: error.response.data.msg,
+              icon: "none",
+              duration: 2000
+            });
+          });
+      }
+    },
+    //单选
+    switchSelect: function(index) {
+      let that = this,
+        cart = that.cartList.valid[index],
+        i = this.checkedIds.indexOf(cart.id);
+      cart.checked = !cart.checked;
+
+      if (i !== -1) this.checkedIds.splice(i, 1);
+      if (cart.checked) {
+        this.checkedIds.push(cart.id);
+      }
+      let len = that.cartList.valid.length;
+      let selectnum = [];
+      for (let i = 0; i < len; i++) {
+        if (that.cartList.valid[i].checked === true) {
+          selectnum.push(true);
+        }
+      }
+      that.isAllSelect = selectnum.length === len;
+      that.$set(that, "cartList", that.cartList);
+      that.$set(that, "isAllSelect", that.isAllSelect);
+      cookie.set(CHECKED_IDS, that.checkedIds);
+      that.carnum();
+      that.countMoney();
+    },
+    //全选
+    allChecked: function(e) {
+      let that = this;
+      let selectAllStatus = e.mp.detail.value[0] ? true : false;
+      // let selectAllStatus = that.isAllSelect;
+      let checkedIds = [];
+      // for (let i = 0; i < array.length; i++) {
+      //   array[i].checked = selectAllStatus;
+      //   checked.push()
+      // }
+      that.cartList.valid.forEach(cart => {
+        cart.checked = selectAllStatus;
+        if (selectAllStatus) {
+          checkedIds.push(cart.id);
+        }
+      });
+      let cartList = {
+        ...that.cartList
+      };
+      that.cartList = [];
+      that.cartList = cartList;
+      this.$set(this, "cartList", this.cartList);
+      this.$set(this, "isAllSelect", selectAllStatus);
+      this.checkedIds = checkedIds;
+      cookie.set(CHECKED_IDS, checkedIds);
+      that.carnum();
+      that.countMoney();
+      this.$forceUpdate();
+    },
+    //数量
+    carnum: function() {
+      let that = this;
+      var carnum = 0;
+      var array = that.cartList.valid;
+      for (let i = 0; i < array.length; i++) {
+        if (array[i].checked === true) {
+          carnum += parseInt(array[i].cartNum);
+        }
+      }
+      that.$set(that, "cartCount", carnum);
+    },
+    //总共价钱；
+    countMoney: function() {
+      let that = this;
+      let carmoney = 0;
+      let array = that.cartList.valid;
+      for (let i = 0; i < array.length; i++) {
+        if (array[i].checked === true) {
+          carmoney = add(carmoney, mul(array[i].cartNum, array[i].truePrice));
+        }
+      }
+      that.countmoney = carmoney;
+    }
+  }
+};
 </script>
diff --git a/pages/user/PersonalData/index.vue b/pages/user/PersonalData/index.vue
index 71bcfd2..548259d 100644
--- a/pages/user/PersonalData/index.vue
+++ b/pages/user/PersonalData/index.vue
@@ -121,11 +121,6 @@ export default {
       userIndex: 0
     };
   },
-  watch: {
-    $yroute(n) {
-      if (n.name === "PersonalData") this.$store.dispatch("USERINFO", true);
-    }
-  },
   computed: mapGetters(["userInfo"]),
   mounted: function() {
     this.avatar = this.userInfo.avatar;
diff --git a/pages/user/Recharge/index.vue b/pages/user/Recharge/index.vue
index 25406fa..9347f5c 100644
--- a/pages/user/Recharge/index.vue
+++ b/pages/user/Recharge/index.vue
@@ -63,14 +63,14 @@ export default {
             icon: "none",
             duration: 2000
           });
-          return
+          return;
         } else if (price < 0.01) {
           uni.showToast({
             title: "转入金额不能低于0.01",
             icon: "none",
             duration: 2000
           });
-          return
+          return;
         }
 
         uni.showModal({
diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue
index 38aa0ef..11396bf 100644
--- a/pages/user/User/index.vue
+++ b/pages/user/User/index.vue
@@ -1,157 +1,161 @@
 <template>
   <view class="user">
-    <view class="header bg-color-red acea-row row-between-wrapper">
-      <view class="picTxt acea-row row-between-wrapper">
-        <view class="pictrue">
-          <image :src="userInfo.avatar" />
-        </view>
-        <view class="text">
-          <view class="acea-row row-middle">
-            <view class="name line1">{{ userInfo.nickname }}</view>
-            <view class="member acea-row row-middle" v-if="userInfo.vip">
-              <image :src="userInfo.vipIcon" />
-              <text>{{ userInfo.vipName }}</text>
-            </view>
+    <view v-if="userInfo.uid">
+      <view class="header bg-color-red acea-row row-between-wrapper">
+        <view class="picTxt acea-row row-between-wrapper">
+          <view class="pictrue">
+            <image :src="userInfo.avatar" />
           </view>
-          <view @click="goPersonalData()" class="id" v-if="userInfo.phone">
-            <text>ID：{{ userInfo.uid || 0}}</text>
-            <text class="iconfont icon-bianji1"></text>
-          </view>
-          <button
-            open-type="getPhoneNumber"
-            @getphonenumber="getPhoneNumber"
-            class="binding"
-            v-else
-          >
-            <text>绑定手机号</text>
-          </button>
-        </view>
-      </view>
-      <text class="iconfont icon-shezhi" @click="goPersonalData()"></text>
-    </view>
-    <view class="wrapper">
-      <view class="nav acea-row row-middle">
-        <view @click="goUserAccount()" class="item">
-          <text>我的余额</text>
-          <text class="num">{{ userInfo.nowMoney || 0 }}</text>
-        </view>
-        <view
-          @click="goUserPromotion()"
-          class="item"
-          v-if="userInfo.isPromoter === 1 || userInfo.statu === 2"
-        >
-          <text>当前佣金</text>
-          <text class="num">{{ userInfo.brokeragePrice || 0 }}</text>
-        </view>
-        <view @click="goIntegral()" class="item" v-else>
-          <text>当前积分</text>
-          <text class="num">{{ userInfo.integral || 0 }}</text>
-        </view>
-        <view @click="goUserCoupon()" class="item">
-          <text>优惠券</text>
-          <text class="num">{{ userInfo.couponCount || 0 }}</text>
-        </view>
-      </view>
-      <view class="myOrder">
-        <view class="title acea-row row-between-wrapper">
-          <text>我的订单</text>
-          <text @click="goMyOrder()" class="allOrder">
-            全部订单
-            <text class="iconfont icon-jiantou"></text>
-          </text>
-        </view>
-        <view class="orderState acea-row row-middle">
-          <view @click="goMyOrder(0)" class="item">
-            <view class="pictrue">
-              <image :src="$VUE_APP_RESOURCES_URL + '/images/dfk.png'" />
-              <text
-                class="order-status-num"
-                v-if="orderStatusNum.unpaidCount > 0"
-              >{{ orderStatusNum.unpaidCount }}</text>
-            </view>
-            <view>待付款</view>
-          </view>
-          <view @click="goMyOrder(1)" class="item">
-            <view class="pictrue">
-              <image :src="$VUE_APP_RESOURCES_URL+'/images/dfh.png'" />
-              <text
-                class="order-status-num"
-                v-if="orderStatusNum.unshippedCount > 0"
-              >{{ orderStatusNum.unshippedCount }}</text>
-            </view>
-            <view>待发货</view>
-          </view>
-          <view @click="goMyOrder(2)" class="item">
-            <view class="pictrue">
-              <image :src="$VUE_APP_RESOURCES_URL+'/images/dsh.png'" />
-              <text
-                class="order-status-num"
-                v-if="orderStatusNum.receivedCount > 0"
-              >{{ orderStatusNum.receivedCount }}</text>
-            </view>
-            <text>待收货</text>
-          </view>
-          <view @click="goMyOrder(3)" class="item">
-            <view class="pictrue">
-              <image :src="$VUE_APP_RESOURCES_URL+'/images/dpj.png'" />
-              <text
-                class="order-status-num"
-                v-if="orderStatusNum.evaluatedCount > 0"
-              >{{ orderStatusNum.evaluatedCount }}</text>
-            </view>
-            <text>待评价</text>
-          </view>
-          <view @click="goReturnList()" class="item">
-            <view class="pictrue">
-              <image :src="$VUE_APP_RESOURCES_URL+'/images/sh.png'" />
-              <text
-                class="order-status-num"
-                v-if="orderStatusNum.refundCount > 0"
-              >{{ orderStatusNum.refundCount }}</text>
-            </view>
-            <text>售后/退款</text>
-          </view>
-        </view>
-      </view>
-      <view class="myService">
-        <view class="title acea-row row-middle">
-          <text>我的服务</text>
-        </view>
-        <view class="serviceList acea-row row-middle">
-          <template v-for="(item, MyMenusIndex) in MyMenus">
-            <view class="item" :key="MyMenusIndex" @click="goPages(MyMenusIndex)" v-if="item.url">
-              <view class="pictrue">
-                <image :src="item.pic" />
+          <view class="text">
+            <view class="acea-row row-middle">
+              <view class="name line1">{{ userInfo.nickname }}</view>
+              <view class="member acea-row row-middle" v-if="userInfo.vip">
+                <image :src="userInfo.vipIcon" />
+                <text>{{ userInfo.vipName }}</text>
               </view>
-              <view>{{ item.name }}</view>
             </view>
-          </template>
+            <view @click="goPersonalData()" class="id" v-if="userInfo.phone">
+              <text>ID：{{ userInfo.uid || 0}}</text>
+              <text class="iconfont icon-bianji1"></text>
+            </view>
+            <button
+              open-type="getPhoneNumber"
+              @getphonenumber="getPhoneNumber"
+              class="binding"
+              v-else
+            >
+              <text>绑定手机号</text>
+            </button>
+          </view>
         </view>
+        <text class="iconfont icon-shezhi" @click="goPersonalData()"></text>
       </view>
-      <!--<view -->
-      <!--class="item"-->
-      <!--@click="changeswitch(true)"-->
-      <!--v-if="userInfo.phone && isWeixin"-->
-      <!--&gt;-->
-      <!--<view class="pictrue"><image :src="$VUE_APP_RESOURCES_URL+'/images/switch.png'" /></view>-->
-      <!--<view>账号切换</!--<view>-->
-      <!--</!--<view>-->
-      <!-- </view>
-      </view>-->
+      <view class="wrapper">
+        <view class="nav acea-row row-middle">
+          <view @click="goUserAccount()" class="item">
+            <text>我的余额</text>
+            <text class="num">{{ userInfo.nowMoney || 0 }}</text>
+          </view>
+          <view
+            @click="goUserPromotion()"
+            class="item"
+            v-if="userInfo.isPromoter === 1 || userInfo.statu === 2"
+          >
+            <text>当前佣金</text>
+            <text class="num">{{ userInfo.brokeragePrice || 0 }}</text>
+          </view>
+          <view @click="goIntegral()" class="item" v-else>
+            <text>当前积分</text>
+            <text class="num">{{ userInfo.integral || 0 }}</text>
+          </view>
+          <view @click="goUserCoupon()" class="item">
+            <text>优惠券</text>
+            <text class="num">{{ userInfo.couponCount || 0 }}</text>
+          </view>
+        </view>
+        <view class="myOrder">
+          <view class="title acea-row row-between-wrapper">
+            <text>我的订单</text>
+            <text @click="goMyOrder()" class="allOrder">
+              全部订单
+              <text class="iconfont icon-jiantou"></text>
+            </text>
+          </view>
+          <view class="orderState acea-row row-middle">
+            <view @click="goMyOrder(0)" class="item">
+              <view class="pictrue">
+                <image :src="$VUE_APP_RESOURCES_URL + '/images/dfk.png'" />
+                <text
+                  class="order-status-num"
+                  v-if="orderStatusNum.unpaidCount > 0"
+                >{{ orderStatusNum.unpaidCount }}</text>
+              </view>
+              <view>待付款</view>
+            </view>
+            <view @click="goMyOrder(1)" class="item">
+              <view class="pictrue">
+                <image :src="$VUE_APP_RESOURCES_URL+'/images/dfh.png'" />
+                <text
+                  class="order-status-num"
+                  v-if="userInfo.orderStatusNum.unshippedCount > 0"
+                >{{ userInfo.orderStatusNum.unshippedCount }}</text>
+              </view>
+              <view>待发货</view>
+            </view>
+            <view @click="goMyOrder(2)" class="item">
+              <view class="pictrue">
+                <image :src="$VUE_APP_RESOURCES_URL+'/images/dsh.png'" />
+                <text
+                  class="order-status-num"
+                  v-if="userInfo.orderStatusNum.receivedCount > 0"
+                >{{ userInfo.orderStatusNum.receivedCount }}</text>
+              </view>
+              <text>待收货</text>
+            </view>
+            <view @click="goMyOrder(3)" class="item">
+              <view class="pictrue">
+                <image :src="$VUE_APP_RESOURCES_URL+'/images/dpj.png'" />
+                <text
+                  class="order-status-num"
+                  v-if="userInfo.orderStatusNum.evaluatedCount > 0"
+                >{{ userInfo.orderStatusNum.evaluatedCount }}</text>
+              </view>
+              <text>待评价</text>
+            </view>
+            <view @click="goReturnList()" class="item">
+              <view class="pictrue">
+                <image :src="$VUE_APP_RESOURCES_URL+'/images/sh.png'" />
+                <text
+                  class="order-status-num"
+                  v-if="userInfo.orderStatusNum.refundCount > 0"
+                >{{ userInfo.orderStatusNum.refundCount }}</text>
+              </view>
+              <text>售后/退款</text>
+            </view>
+          </view>
+        </view>
+        <view class="myService">
+          <view class="title acea-row row-middle">
+            <text>我的服务</text>
+          </view>
+          <view class="serviceList acea-row row-middle">
+            <template v-for="(item, MyMenusIndex) in MyMenus">
+              <view class="item" :key="MyMenusIndex" @click="goPages(MyMenusIndex)" v-if="item.url">
+                <view class="pictrue">
+                  <image :src="item.pic" />
+                </view>
+                <view>{{ item.name }}</view>
+              </view>
+            </template>
+          </view>
+        </view>
+        <!--<view -->
+        <!--class="item"-->
+        <!--@click="changeswitch(true)"-->
+        <!--v-if="userInfo.phone && isWeixin"-->
+        <!--&gt;-->
+        <!--<view class="pictrue"><image :src="$VUE_APP_RESOURCES_URL+'/images/switch.png'" /></view>-->
+        <!--<view>账号切换</!--<view>-->
+        <!--</!--<view>-->
+        <!-- </view>
+        </view>-->
+      </view>
+      <view style="text-align: center;margin-top: 1rem">By@意象</view>
+      <view class="footer-line-height"></view>
+      <SwitchWindow
+        v-on:changeswitch="changeswitch"
+        :switchActive="switchActive"
+        :login_type="userInfo.login_type"
+      ></SwitchWindow>
     </view>
-    <view style="text-align: center;margin-top: 1rem">By@意象</view>
-    <view class="footer-line-height"></view>
-    <SwitchWindow
-      v-on:changeswitch="changeswitch"
-      :switchActive="switchActive"
-      :login_type="userInfo.login_type"
-    ></SwitchWindow>
+    <Authorization v-else />
   </view>
 </template>
 <script>
 import { getUser, getMenuUser, bindingPhone } from "@/api/user";
 import { isWeixin, VUE_APP_RESOURCES_URL } from "@/utils";
 import SwitchWindow from "@/components/SwitchWindow";
+import Authorization from "@/pages/authorization/index";
 import { mapGetters } from "vuex";
 
 const NAME = "User";
@@ -159,30 +163,18 @@ const NAME = "User";
 export default {
   name: NAME,
   components: {
-    SwitchWindow
+    SwitchWindow,
+    Authorization
   },
   props: {},
   data: function() {
     return {
-      userInfo: {},
       MyMenus: [],
-      orderStatusNum: {},
       switchActive: false,
       isWeixin: false
     };
   },
-  computed: mapGetters(["wxCode"]),
-  watch: {
-    $yroute(n) {
-      if (n.name === NAME) this.User();
-    }
-  },
-  mounted: function() {
-    console.log("这个是个人中心");
-    this.User();
-    this.MenuUser();
-    this.isWeixin = isWeixin();
-  },
+  computed: mapGetters(["userInfo"]),
   methods: {
     goReturnList() {
       this.$yrouter.push("/pages/order/ReturnList/index");
@@ -214,33 +206,44 @@ export default {
     },
     getPhoneNumber: function(e) {
       console.log(e.mp.detail);
+      // 判断一下这里是不是小程序 如果是小程序，走获取微信手机号进行绑定
       if (e.mp.detail.errMsg == "getPhoneNumber:ok") {
         uni.showLoading({
           title: "绑定中"
         });
-        wx.login({
-          success: loginRes => {
-            bindingPhone({
-              code: loginRes.code,
-              encryptedData: e.mp.detail.encryptedData,
-              iv: e.mp.detail.iv
-            })
-              .then(res => {
-                this.User();
-                uni.hideLoading();
-                uni.showToast({
-                  title: res.msg,
-                  icon: "success",
-                  duration: 2000
-                });
-              })
-              .catch(error => {
-                uni.showToast({
-                  title: error.msg || error.response.data.msg,
-                  icon: "none",
-                  duration: 2000
-                });
+        // 获取当前环境的服务商
+        uni.getProvider({
+          service: "oauth",
+          success: function(res) {
+            console.log(res.provider);
+            // 此处可以排除h5
+            if (res.provider) {
+              uni.login({
+                success: loginRes => {
+                  bindingPhone({
+                    code: loginRes.code,
+                    encryptedData: e.mp.detail.encryptedData,
+                    iv: e.mp.detail.iv
+                  })
+                    .then(res => {
+                      this.User();
+                      uni.hideLoading();
+                      uni.showToast({
+                        title: res.msg,
+                        icon: "success",
+                        duration: 2000
+                      });
+                    })
+                    .catch(error => {
+                      uni.showToast({
+                        title: error.msg || error.response.data.msg,
+                        icon: "none",
+                        duration: 2000
+                      });
+                    });
+                }
               });
+            }
           }
         });
       } else {
@@ -256,10 +259,10 @@ export default {
     },
     User: function() {
       let that = this;
-      getUser().then(res => {
-        that.userInfo = res.data;
-        that.orderStatusNum = res.data.orderStatusNum;
-      });
+      // getUser().then(res => {
+      // 	that.user = res.data;
+      // 	that.orderStatusNum = res.data.orderStatusNum;
+      // });
     },
     MenuUser: function() {
       let that = this;
@@ -287,12 +290,12 @@ export default {
         url === "/pages/orderAdmin/OrderIndex/index" &&
         !this.userInfo.adminid
       ) {
-		   uni.showToast({
-            title: "您还不是管理员！！",
-            icon: "none",
-            duration: 2000
-          });
-          return;
+        uni.showToast({
+          title: "您还不是管理员！！",
+          icon: "none",
+          duration: 2000
+        });
+        return;
       }
 
       this.$yrouter.push({
@@ -300,10 +303,18 @@ export default {
       });
     }
   },
+  watch: {
+    userInfo() {
+      this.MenuUser();
+    }
+  },
   onShow() {
-    this.User();
-    this.MenuUser();
-    this.isWeixin = isWeixin();
+    console.log(this.userInfo);
+    if (this.userInfo.uid) {
+      this.User();
+      this.MenuUser();
+      this.isWeixin = isWeixin();
+    }
   }
 };
 </script>
diff --git a/pages/user/promotion/Poster/index.vue b/pages/user/promotion/Poster/index.vue
index 3ae20e3..fa702bb 100644
--- a/pages/user/promotion/Poster/index.vue
+++ b/pages/user/promotion/Poster/index.vue
@@ -73,23 +73,6 @@ export default {
       );
     },
     downloadIamge: function(imgsrc, name) {
-      // let image = new Image();
-      // image.setAttribute("crossOrigin", "anonymous");
-      // image.onload = function() {
-      //   // let canvas = document.createElement("canvas");
-      //   // canvas.width = image.width;
-      //   // canvas.height = image.height;
-      //   // let context = canvas.getContext("2d");
-      //   // context.drawImage(image, 0, 0, image.width, image.height);
-      //   // let url = canvas.toDataURL("image/png"); //得到图片的base64编码数据
-      //   // let a = document.createElement("a"); // 生成一个a元素
-      //   // let event = new MouseEvent("click"); // 创建一个单击事件
-      //   // a.download = name || "photo"; // 设置图片名称
-      //   // a.href = url; // 将生成的URL设置为a.href属性
-      //   // a.dispatchEvent(event); // 触发a的单击事件
-      // };
-      // image.src = imgsrc;
-
       var that = this;
       this.isDown = true;
       var downloadUrl = imgsrc;
diff --git a/store/index.js b/store/index.js
index d0a2efc..4384ce8 100644
--- a/store/index.js
+++ b/store/index.js
@@ -12,15 +12,11 @@ const LOGIN_KEY = "login_status";
 
 const vuexStore = new Vuex.Store({
   state: {
-    wxCode: null,
+    // 是否已经在授权页面
     isAuthorizationPage: false,
+    // 是否授权
     isAuthorization: false,
-    footer: true,
-    home: true,
-    tabtarIndex: 0,
-    homeActive: false,
     token: store.get(LOGIN_KEY) || null,
-    backgroundColor: "#fff",
     userInfo: null
   },
   mutations: {
@@ -50,8 +46,9 @@ const vuexStore = new Vuex.Store({
       store.set(LOGIN_KEY, token, expires_time);
     },
     LOGOUT(state) {
-      state.token = undefined;
-      store.remove(LOGIN_KEY);
+      state.token = null;
+      state.userInfo = null
+      store.clearAll()
     },
     BACKGROUND_COLOR(state, color) {
       state.color = color;
@@ -66,10 +63,6 @@ const vuexStore = new Vuex.Store({
     UPDATE_AUTHORIZATION(state, isAuthorization) {
       state.isAuthorization = isAuthorization;
     },
-    UPDATE_WXCODE(state, wxCode) {
-      console.log(wxCode, 'wxCode')
-      state.wxCode = wxCode;
-    }
   },
   actions: {
     USERINFO({ state, commit }, force) {
@@ -85,31 +78,25 @@ const vuexStore = new Vuex.Store({
           dialog.error("获取信息失败!");
         });
     },
+    changeLogin({ state, commit }, data, date) {
+      commit("LOGIN", data, date);
+    },
     changeUserInfo({ state, commit }, user) {
       commit("UPDATE_USERINFO", user.user);
     },
-    changeTabtar({ state, commit }, index) {
-      commit("CHANGE_TABTAR", index);
+    changeAuthorizationPage({ state, commit }, index) {
+      commit("UPDATE_AUTHORIZATIONPAGE", index);
     },
     changeAuthorization({ state, commit }, index) {
       commit("UPDATE_AUTHORIZATION", index);
     },
-    changeWxCode({ state, commit }, index) {
-      commit("UPDATE_WXCODE", index);
-    },
   },
   getters: {
-    wxCode: state => state.wxCode,
     isAuthorizationPage: state => state.isAuthorizationPage,
     isAuthorization: state => state.isAuthorization,
-    footer: state => state.footer,
-    homeActive: state => state.homeActive,
-    home: state => state.home,
     token: state => state.token,
     isLogin: state => !!state.token,
-    backgroundColor: state => state.backgroundColor,
     userInfo: state => state.userInfo || {},
-    tabtarIndex: state => state.tabtarIndex
   },
   strict: debug
 });
diff --git a/utils/index.js b/utils/index.js
index 121d048..7ce7820 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -97,7 +97,7 @@ export function getCurrentPageUrlWithArgs() {
 
 // 复制到剪切板
 export const copyClipboard = (data) => {
-	wx.setClipboardData({
+	uni.setClipboardData({
 		data: data,
 		success: (res) => {
 			uni.showToast({
@@ -110,139 +110,209 @@ export const copyClipboard = (data) => {
 }
 
 
-export const toAuthorization = (msg) => {
+export const replaceLogin = (msg) => {
 	uni.hideLoading();
 	uni.showToast({
 		title: msg,
 		icon: 'none',
 		duration: 2000
 	});
-	console.log(222222222)
-	replace({
-		path: '/pages/user/Login/index',
-		query: {
-			redirect: `/${getCurrentPageUrl()}`,
-			...parseQuery()
-		}
+	console.log(Vue.prototype.$deviceType)
+	// 这里代表已经失去登录状态以及401强制推出登录了
+	store.commit('LOGOUT')
+
+	if (Vue.prototype.$deviceType == 'Weixin') {
+		// 如果是微信小程序，跳转到授权页
+		replace({
+			path: '/pages/authorization/index',
+			query: {
+				redirect: `/${getCurrentPageUrl()}`,
+				...parseQuery()
+			}
+		})
+	} else {
+		// 如果不是小程序跳转到登录页
+		replace({
+			path: '/pages/user/Login/index',
+			query: query || {
+				redirect: `/${getCurrentPageUrl()}`,
+				...parseQuery()
+			}
+		})
+	}
+}
+
+export const getProvider = () => {
+	return new Promise((resolve, reject) => {
+		// 获取当前环境的服务商
+		uni.getProvider({
+			service: 'oauth',
+			success: function (res) {
+				console.log(`当前环境的服务商为 | ${res.provider}`)
+				// 此处可以排除h5
+				if (res.provider) {
+					resolve(res.provider[0])
+				}
+			},
+			fail() {
+				reject('获取环境服务商失败')
+			}
+		})
+	}).catch(error => {
+		console.log(error)
+	})
+
+}
+
+export const authorize = (authorizeStr) => {
+	return new Promise((resolve, reject) => {
+		uni.authorize({
+			scope: `scope.${authorizeStr}`,
+			success() {
+				resolve('获取授权成功')
+			},
+			fail() {
+				reject('获取授权失败')
+			}
+		})
+	}).catch(error => {
+		console.log(error)
 	})
 }
 
 export const login = (option) => {
 	console.log('调用登录')
 	return new Promise((resolve, reject) => {
-		// 获取当前环境的服务商
-		uni.getProvider({
-			service: 'oauth',
-			success: function(res) {
-				console.log(res.provider)
-				// 此处可以排除h5
-				if (res.provider) {
-					// 调用登录接口
-					uni.login({
-						provider: res.provider[0],
-						success: function(loginRes) {
-							// 微信登录
-							console.log('获取code')
-							let code = loginRes.code;
-							store.commit("UPDATE_WXCODE", loginRes.code);
+		getProvider().then(provider => {
+			// 调用登录接口
+			uni.login({
+				provider: provider,
+				success: function (loginRes) {
+					// 微信登录
+					console.log(`获取code | ${loginRes.code}`)
+					let code = loginRes.code;
+					// 检查授权， 检查用户信息授权
+					authorize('userInfo').then(() => {
+						uni.getUserInfo({
+							provider: provider,
+							success: function (user) {
+								console.log(user)
+								console.log(`用户昵称为 | ${user.userInfo.nickName}`);
+								console.log(`当前的环境 | ${Vue.prototype.$deviceType}`)
+								if (Vue.prototype.$deviceType == 'Weixin') {
+									wxappAuth({
+										encryptedData: user.encryptedData,
+										iv: user.iv,
+										code: code,
+										spread: cookie.get("spread")
+									}).then(({
+										data
+									}) => {
+										console.log('登录成功')
+										console.log(data)
+										console.log('登录成功1')
 
-							console.log(JSON.stringify(loginRes));
-							// 检查授权， 检查用户信息授权
-							uni.authorize({
-								scope: 'scope.userInfo',
-								success() {
-									uni.getUserInfo({
-										provider: res.provider[0],
-										success: function(user) {
-											console.log(user)
-											console.log('用户昵称为：' + user.userInfo.nickName);
-											if (Vue.prototype.$deviceType == 'Weixin') {
-												wxappAuth({
-													encryptedData: user.encryptedData,
-													iv: user.iv,
-													code: code,
-													spread: cookie.get("spread")
-												}).then(({
-													data
-												}) => {
-													resolve(res.data)
-													uni.hideLoading();
-													store.commit("LOGIN", data.token, dayjs(data.expires_time));
-													getUser().then(res => {
-														store.dispatch('changeUserInfo', {
-															user: res.data
-														})
-													});
-													var pages = getCurrentPages() //获取加载的页面
-													var currentPage = pages[pages.length - 1] //获取当前页面的对象
-													let url = "/pages/home/index"
-													let query = {}
-													if (currentPage) {
-														if (currentPage.route != 'pages/Loading/index' && currentPage.route !=
-															'pages/user/Login/index') {
-															url = currentPage.route
-														}
-														if (currentPage.route == 'pages/user/Login/index') {
-															const {
-																redirect,
-																...querys
-															} = currentPage.options
-															url = redirect
-															query = { ...querys
-															}
-														}
+										resolve(data)
+										console.log('登录成功3')
+
+										uni.hideLoading();
+										console.log('登录成功4')
+										store.commit("LOGIN", data.token, dayjs(data.expires_time));
+										console.log('登录成功5')
+
+										getUser().then(res => {
+											store.dispatch('changeUserInfo', {
+												user: res.data
+											})
+											console.log('登录成功6')
+											console.log(option)
+											// option && option.success ? option.success() : null
+											var pages = getCurrentPages() //获取加载的页面
+											console.log('登录成功7')
+
+											var currentPage = pages[pages.length - 1] //获取当前页面的对象
+											let url = "/pages/home/index"
+											let query = {}
+											console.log('登录成功8')
+											console.log(currentPage)
+
+											if (currentPage) {
+												// 获取到最后一个页面
+												if (
+													currentPage.route != 'pages/Loading/index'
+													&&
+													currentPage.route != 'pages/user/Login/index'
+												) {
+													url = currentPage.route
+												}
+												if (currentPage.route == 'pages/authorization/index') {
+													const {
+														redirect,
+														...querys
+													} = currentPage.options
+													url = redirect
+													query = {
+														...querys
 													}
-													switchTab({
-														path: url,
-														query
-													});
-												}).catch(error => {
-													reject()
-													option && option.fail ? option.fail() : toAuthorization('获取用户信息失败，请重试')
-												});
+												}
 											}
+											console.log('登录成功9')
+											console.log({
+												path: url,
+												query
+											})
+											switchTab({
+												path: `${url}`,
+												query
+											});
+										})
 
-
-										},
-										fail() {
-											// 获取用户信息失败
-											reject()
-											option && option.fail ? option.fail() : toAuthorization('获取用户信息失败，请重试')
-										}
+									}).catch(error => {
+										reject()
+										console.log('微信登录失败')
+										console.log(error)
+										handleFail(option, '微信登录失败')
 									});
-								},
-								fail() {
-									// 获取用户信息失败
-									reject()
-									option && option.fail ? option.fail() : toAuthorization('获取用户信息失败，请重试')
 								}
-							})
-						},
-						fail() {
-							// 调用登录接口失败
-							reject()
-							option && option.fail ? option.fail() : toAuthorization('获取用户信息失败，请重试')
-						}
-					});
+							},
+							fail() {
+								// 获取用户信息失败
+								reject()
+								handleFail(option, '获取用户信息失败')
+							}
+						});
+					}).catch(error => {
+						reject()
+						console.log(error)
+						handleFail(option, '拒绝授权')
+					})
+				},
+				fail() {
+					// 调用登录接口失败
+					reject()
+					handleFail(option, '登录失败')
 				}
-			},
-			fail() {
-				reject()
-				option && option.fail ? option.fail() : toAuthorization('获取用户信息失败，请重试')
-			}
-		});
-
+			});
+		}).catch(error => {
+			reject()
+			console.log(error)
+			handleFail(option, '获取环境服务商失败')
+		})
+	}).catch(error => {
+		console.log(error)
+		handleFail(option, '登录失败')
 	})
 }
 
 
-
-
-
+const handleFail = (option, msg) => {
+	// 此处是处理登录失效的问题的
+	console.log(store)
+	option && option.fail ? option.fail() : replaceLogin('登录失败，请重新登录')
+}
 
 export function parseUrl(location) {
 	if (typeof location === 'string') return location
-
 	const {
 		path,
 		query
@@ -272,53 +342,95 @@ export function parseRoute($mp) {
 	}
 }
 
-export function push(location, complete, fail, success) {
+
+export const handleLoginStatus = (location, complete, fail, success) => {
+	console.log(location, '开始健全')
+	// 不登录可访问的页面
+	let page = [{
+		path: '/pages/Loading/index',
+		name: 'loading页面'
+	},
+	{
+		path: '/pages/home/index',
+		name: '首页'
+	},
+	{
+		path: '/pages/user/Login/index',
+		name: '登录页面'
+	},
+	{
+		path: '/pages/authorization/index',
+		name: '授权页面'
+	},
+	]
+
+	// 是否可以访问
+	let isAuth = false
+
+	// 从 location 中获取当前url，location typeof string || object
 	let path = ''
 	if (typeof location === 'string') {
 		path = location
 	} else {
 		path = location.path
 	}
-	console.log(path)
-	if (path != '/pages/launch/index' || path != '/pages/loading/index' || path != '/pages/home/index' || path !=
-		'/pages/loading/index') {
-		if (!store.getters.userInfo.uid) {
-			replace({
-				path: '/pages/user/Login/index',
-				query: {
-					redirect: `/${getCurrentPageUrl()}`,
-					...parseQuery()
-				}
-			})
-			return
-		}
-	}
-	const url = parseUrl(location)
-	const params = {
-		url,
-		complete,
-		fail,
-		success
+
+	console.log(store.getters.userInfo, '用户信息')
+	if (!store.getters.userInfo.uid) {
+		page.map((item) => {
+			console.log(item.path == path)
+			if (item.path == path) {
+				isAuth = true
+			}
+		})
+	} else {
+		isAuth = true
 	}
 
-	if (location.isTab) {
-		uni.switchTab(params)
-		return
-	}
-	if (location.reLaunch) {
-		uni.reLaunch(params)
-		return
-	}
-	uni.navigateTo(params)
+	return new Promise((resolve, reject) => {
+		if (isAuth) {
+			console.log('有权限')
+			// 登录了有权限
+			console.log({
+				url: parseUrl(location),
+				complete,
+				fail,
+				success
+			})
+			resolve({
+				url: parseUrl(location),
+				complete,
+				fail,
+				success
+			})
+		} else {
+			console.log('无权限')
+			// 未登录没有权限
+			replaceLogin()
+			reject()
+		}
+	}).catch(error => {
+		console.log(error)
+	})
+}
+
+export function push(location, complete, fail, success) {
+	handleLoginStatus(location, complete, fail, success).then(params => {
+		console.log(params)
+		uni.navigateTo(params)
+	}).catch(error => {
+		// 没有权限
+
+	})
 }
 
 export function replace(location, complete, fail, success) {
-	const url = parseUrl(location)
-	uni.redirectTo({
-		url,
-		complete,
-		fail,
-		success
+	handleLoginStatus(location, complete, fail, success).then(params => {
+		console.log(params)
+		uni.redirectTo(params)
+	}).catch(error => {
+		// 没有权限
+
 	})
 }
 
@@ -331,18 +443,18 @@ export function go(delta) {
 export function back() {
 	uni.navigateBack({
 		delta: 1,
-		success: function(e) {},
-		fail: function(e) {}
+		success: function (e) { },
+		fail: function (e) { }
 	})
 }
 
 export function switchTab(location, complete, fail, success) {
-	const url = parseUrl(location)
-	uni.switchTab({
-		url,
-		complete,
-		fail,
-		success
+	console.log(location)
+	handleLoginStatus(location, complete, fail, success).then(params => {
+		console.log(params)
+		uni.switchTab(params)
+	}).catch(error => {
+		// 没有权限
 	})
 }
 
@@ -383,20 +495,19 @@ export function handleQrCode() {
 }
 
 const getImageInfo = (images) => {
-	console.log(images)
 	return new Promise((resolve, reject) => {
 		let imageAry = {}
 		images.map((item, index) => {
-			wx.getImageInfo({
+			uni.getImageInfo({
 				src: item,
-				fail: function(res) {
+				fail: function (res) {
 					imageAry[index] = null
 					console.log(res)
 					if (imageAry.length == images.length) {
 						resolve(imageAry)
 					}
 				},
-				success: function(res) {
+				success: function (res) {
 					imageAry[index] = res
 					console.log(res)
 					if (Object.keys(imageAry).length == images.length) {
@@ -425,7 +536,7 @@ export const PosterCanvas = (store, successCallBack) => {
 	});
 	getImageInfo([store.image, store.code]).then(res => {
 		let contentHh = 48 * 1.3
-		const ctx = wx.createCanvasContext('myCanvas');
+		const ctx = uni.createCanvasContext('myCanvas');
 		ctx.clearRect(0, 0, 0, 0);
 		const WIDTH = 747
 		const HEIGHT = 1326;
@@ -455,17 +566,17 @@ export const PosterCanvas = (store, successCallBack) => {
 		ctx.fillText('长按识别二维码立即购买', WIDTH / 2, 1167);
 		// ctx.drawImage(store.code, 199, 1064, 200, 200);
 		ctx.save();
-		ctx.draw(true, function(oi) {
-			wx.canvasToTempFilePath({
+		ctx.draw(true, function (oi) {
+			uni.canvasToTempFilePath({
 				canvasId: 'myCanvas',
 				fileType: 'png',
 				destWidth: WIDTH,
 				destHeight: HEIGHT,
-				success: function(res) {
+				success: function (res) {
 					uni.hideLoading();
 					successCallBack && successCallBack(res.tempFilePath);
 				},
-				fail: function(error) {
+				fail: function (error) {
 					console.log(error)
 				},
 
@@ -473,7 +584,7 @@ export const PosterCanvas = (store, successCallBack) => {
 		});
 	})
 
-	// wx.getImageInfo({
+	// uni.getImageInfo({
 	//   src: store.image,
 	//   fail: function (res) {
 	//     uni.showToast({
@@ -486,4 +597,4 @@ export const PosterCanvas = (store, successCallBack) => {
 
 	//   }
 	// })
-}
+}
diff --git a/utils/store/cookie.js b/utils/store/cookie.js
index f887015..eeb6714 100644
--- a/utils/store/cookie.js
+++ b/utils/store/cookie.js
@@ -7,69 +7,36 @@ function get(key) {
   if (!key || !_has(key)) {
     return null;
   }
-  return wx.getStorageSync(key)
-  // let regexpStr =
-  //   "(?:^|.*;\\s*)" +
-  //   escape(key).replace(/[-.+*]/g, "\\$&") +
-  //   "\\s*\\=\\s*((?:[^;](?!;))*[^;]?).*";
-  // return JSON.parse(unescape(doc.cookie.replace(new RegExp(regexpStr), "$1")));
-
+  return uni.getStorageSync(key)
 }
 
 function all() {
-  return wx.getStorageInfoSync()
-  // let cookies = doc.cookie.split(/; ?/g),
-  //   data = {};
-  // for (let i = cookies.length - 1; i >= 0; i--) {
-  //   if (!trim(cookies[i])) {
-  //     continue;
-  //   }
-  //   let kvp = cookies[i].split("=");
-  //   let key = unescape(kvp[0]);
-  //   data[key] = unescape(kvp[1]);
-  // }
-  // return data;
+  return uni.getStorageInfoSync()
 }
 
 function set(key, data, time) {
   if (!key) {
     return;
   }
-  // let expires = "Tue, 19 Jan 2038 03:14:07 GMT";
-  // if (time) {
-  //   let date;
-  //   if (isType(time, "Date")) {
-  //     date = time;
-  //   } else {
-  //     date = new Date();
-  //     date.setTime(date.getTime() + time * 60000);
-  //   }
-  //   expires = date.toGMTString();
-  // }
-
-  // data = JSON.stringify(data);
-  // doc.cookie =
-  //   escape(key) + "=" + escape(data) + "; expires=" + expires + "; path=/";
-
-  wx.setStorageSync(key, data)
+  uni.setStorageSync(key, data)
 }
 
 function remove(key) {
   if (!key || !_has(key)) {
     return;
   }
-  wx.removeStorageSync(key)
+  uni.removeStorageSync(key)
 }
 
 function clearAll() {
-  wx.clearStorage()
+  uni.clearStorage()
 }
 
 function _has(key) {
   if (!key) {
     return
   }
-  let value = wx.getStorageSync(key)
+  let value = uni.getStorageSync(key)
   if (value) {
     return true
   }