11.15

pages/index.vue

@@ -148,6 +148,7 @@
 
 <script>
 	import PrivacyPopup from "@/components/privacyPopup/index.vue";
+	import uploadUrl from '@/common/config.js'
 	import {
 		getBannerDataReq,
 		getAddressDataReq,
@@ -280,6 +281,22 @@
 		},
 		onShow() {
 			this.handlePrivate()
+
+			// if (!uni.getStorageSync('switchs')) {
+			uni.setStorageSync('switchs', [1, 0, 0])
+			// }
+			// if (!uni.getStorageSync('priceConfig')) {
+			uni.request({
+				url: uploadUrl.baseUrl + '/api/common/getPriceConfig',
+				method: "GET",
+				success: (res) => {
+					if (res.data.code == 0) {
+						console.log('index中获取的会员折扣数据', res.data.data)
+						uni.setStorageSync('priceConfig', res.data.data)
+					}
+				}
+			})
+			// }
 		},
 		methods: {
 			confirmP() {

pages/mall.vue

@@ -88,6 +88,7 @@
 
 <script>
 	import classifyData from '@/common/classify.data.js';
+	import uploadUrl from '@/common/config.js'
 
 	import {
 		getMallCatReq,
@@ -160,7 +161,21 @@
 			}
 		},
 		async onShow() {
-
+			// if (!uni.getStorageSync('switchs')) {
+			uni.setStorageSync('switchs', [1, 0, 0])
+			// }
+			// if (!uni.getStorageSync('priceConfig')) {
+			uni.request({
+				url: uploadUrl.baseUrl + '/api/common/getPriceConfig',
+				method: "GET",
+				success: (res) => {
+					if (res.data.code == 0) {
+						console.log('mall中获取的会员折扣数据', res.data.data)
+						uni.setStorageSync('priceConfig', res.data.data)
+					}
+				}
+			})
+			// }
 		},
 		onReady() {
 

pages/my.vue

@@ -119,6 +119,7 @@
 
 <script>
 	import uploadUrl from '@/common/config.js'
+
 	import {
 		wxAuthLoginReq,
 		getUserInfoReq,
@@ -204,6 +205,22 @@
 			}
 		},
 		async onShow() {
+			// if (!uni.getStorageSync('switchs')) {
+			uni.setStorageSync('switchs', [1, 0, 0])
+			// }
+			// if (!uni.getStorageSync('priceConfig')) {
+			uni.request({
+				url: uploadUrl.baseUrl + '/api/common/getPriceConfig',
+				method: "GET",
+				success: (res) => {
+					if (res.data.code == 0) {
+						console.log('my中获取的会员折扣数据', res.data.data)
+						uni.setStorageSync('priceConfig', res.data.data)
+					}
+				}
+			})
+			// }
+
 			if (uni.getStorageSync('token')) {
 				let res = await getUserInfoReq()
 				if (res.code == 0) {

pages/my/userInfo/index.vue

@@ -187,6 +187,7 @@
 						if (res.confirm) {
 							uni.removeStorageSync('token')
 							uni.setStorageSync('switchs', [1, 0, 0])
+							uni.removeStorageSync('priceConfig')
 							uni.reLaunch({
 								url: '/pages/my'
 							})

pages/service.vue

@@ -52,6 +52,7 @@
 	import {
 		getServerDataReq
 	} from '@/api/test/index.js'
+	import uploadUrl from '@/common/config.js'
 	export default {
 		// components: {
 		// 	navBar
@@ -81,6 +82,23 @@
 				})
 			}
 		},
+		onShow() {
+			// if (!uni.getStorageSync('switchs')) {
+			uni.setStorageSync('switchs', [1, 0, 0])
+			// }
+			// if (!uni.getStorageSync('priceConfig')) {
+			uni.request({
+				url: uploadUrl.baseUrl + '/api/common/getPriceConfig',
+				method: "GET",
+				success: (res) => {
+					if (res.data.code == 0) {
+						console.log('my中获取的会员折扣数据', res.data.data)
+						uni.setStorageSync('priceConfig', res.data.data)
+					}
+				}
+			})
+			// }
+		},
 		methods: {
 			goDetail(content, title, item) {
 				getApp().serCon = content

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -21087,7 +21087,10 @@ module.exports = function (vm) {
     var statusCode = response.statusCode;
     if (statusCode == 401) {
       uni.hideLoading();
-      uni.clearStorageSync();
+      // uni.clearStorageSync()
+      uni.removeStorageSync('token');
+      uni.removeStorageSync('priceConfig');
+      uni.setStorageSync('switchs', [1, 0, 0]);
       uni.$u.toast('请登录后操作');
       setTimeout(function () {
         uni.reLaunch({
@@ -21096,8 +21099,11 @@ module.exports = function (vm) {
       }, 1500);
     } else if (statusCode == 402) {
       uni.hideLoading();
-      uni.clearStorageSync();
-      uni.$u.toast('您已被拉黑，请联系管理员');
+      // uni.clearStorageSync()
+      uni.removeStorageSync('token');
+      uni.removeStorageSync('priceConfig');
+      uni.setStorageSync('switchs', [1, 0, 0]);
+      uni.$u.toast('您已被限制登录，请联系管理员');
       setTimeout(function () {
         uni.reLaunch({
           url: '/pages/my'

unpackage/dist/dev/mp-weixin/pages/index.js

@@ -178,6 +178,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 32));
 var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 34));
+var _config = _interopRequireDefault(__webpack_require__(/*! @/common/config.js */ 35));
 var _index = __webpack_require__(/*! @/api/index/index.js */ 166);
 var _index2 = __webpack_require__(/*! @/api/test/index.js */ 178);
 var PrivacyPopup = function PrivacyPopup() {
@@ -322,7 +323,24 @@ var _default = {
   },
   onShow: function onShow() {
     this.handlePrivate();
+
+    // if (!uni.getStorageSync('switchs')) {
+    uni.setStorageSync('switchs', [1, 0, 0]);
+    // }
+    // if (!uni.getStorageSync('priceConfig')) {
+    uni.request({
+      url: _config.default.baseUrl + '/api/common/getPriceConfig',
+      method: "GET",
+      success: function success(res) {
+        if (res.data.code == 0) {
+          console.log('index中获取的会员折扣数据', res.data.data);
+          uni.setStorageSync('priceConfig', res.data.data);
+        }
+      }
+    });
+    // }
   },
+
   methods: {
     confirmP: function confirmP() {
       this.showPop = false;

unpackage/dist/dev/mp-weixin/pages/mall.js

@@ -208,6 +208,7 @@ exports.default = void 0;
 var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 32));
 var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 34));
 var _classifyData = _interopRequireDefault(__webpack_require__(/*! @/common/classify.data.js */ 188));
+var _config = _interopRequireDefault(__webpack_require__(/*! @/common/config.js */ 35));
 var _index = __webpack_require__(/*! @/api/test/index.js */ 178);
 //
 //
@@ -375,6 +376,22 @@ var _default = {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
+              // if (!uni.getStorageSync('switchs')) {
+              uni.setStorageSync('switchs', [1, 0, 0]);
+              // }
+              // if (!uni.getStorageSync('priceConfig')) {
+              uni.request({
+                url: _config.default.baseUrl + '/api/common/getPriceConfig',
+                method: "GET",
+                success: function success(res) {
+                  if (res.data.code == 0) {
+                    console.log('mall中获取的会员折扣数据', res.data.data);
+                    uni.setStorageSync('priceConfig', res.data.data);
+                  }
+                }
+              });
+              // }
+            case 2:
             case "end":
               return _context2.stop();
           }

unpackage/dist/dev/mp-weixin/pages/my.js

@@ -258,16 +258,31 @@ var _default = {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
+              // if (!uni.getStorageSync('switchs')) {
+              uni.setStorageSync('switchs', [1, 0, 0]);
+              // }
+              // if (!uni.getStorageSync('priceConfig')) {
+              uni.request({
+                url: _config.default.baseUrl + '/api/common/getPriceConfig',
+                method: "GET",
+                success: function success(res) {
+                  if (res.data.code == 0) {
+                    console.log('my中获取的会员折扣数据', res.data.data);
+                    uni.setStorageSync('priceConfig', res.data.data);
+                  }
+                }
+              });
+              // }
               if (!uni.getStorageSync('token')) {
-                _context.next = 51;
+                _context.next = 53;
                 break;
               }
-              _context.next = 3;
+              _context.next = 5;
               return (0, _index.getUserInfoReq)();
-            case 3:
+            case 5:
               res = _context.sent;
               if (!(res.code == 0)) {
-                _context.next = 50;
+                _context.next = 52;
                 break;
               }
               _this2.userInfo = res.data;
@@ -291,70 +306,70 @@ var _default = {
               // this.checkRole()
               // return
               if (!res.data.status) {
-                _context.next = 32;
+                _context.next = 34;
                 break;
               }
               _context.t0 = res.data.type;
-              _context.next = _context.t0 === 0 ? 13 : _context.t0 === 1 ? 15 : _context.t0 === 2 ? 17 : _context.t0 === 3 ? 20 : _context.t0 === 4 ? 22 : _context.t0 === 5 ? 24 : _context.t0 === 6 ? 27 : 29;
+              _context.next = _context.t0 === 0 ? 15 : _context.t0 === 1 ? 17 : _context.t0 === 2 ? 19 : _context.t0 === 3 ? 22 : _context.t0 === 4 ? 24 : _context.t0 === 5 ? 26 : _context.t0 === 6 ? 29 : 31;
               break;
-            case 13:
-              _this2.role = 'yk';
-              return _context.abrupt("break", 29);
             case 15:
-              _this2.role = 'svip';
-              return _context.abrupt("break", 29);
+              _this2.role = 'yk';
+              return _context.abrupt("break", 31);
             case 17:
+              _this2.role = 'svip';
+              return _context.abrupt("break", 31);
+            case 19:
               _this2.role = 'lhy';
               uni.setStorageSync('switchs', [0, 1, 0]);
-              return _context.abrupt("break", 29);
-            case 20:
-              _this2.role = 'cydg';
-              return _context.abrupt("break", 29);
+              return _context.abrupt("break", 31);
             case 22:
-              _this2.role = 'hdyh';
-              return _context.abrupt("break", 29);
+              _this2.role = 'cydg';
+              return _context.abrupt("break", 31);
             case 24:
+              _this2.role = 'hdyh';
+              return _context.abrupt("break", 31);
+            case 26:
               _this2.role = 'hy';
               uni.setStorageSync('switchs', [0, 1, 0]);
-              return _context.abrupt("break", 29);
-            case 27:
-              _this2.role = 'gvip';
-              return _context.abrupt("break", 29);
+              return _context.abrupt("break", 31);
             case 29:
+              _this2.role = 'gvip';
+              return _context.abrupt("break", 31);
+            case 31:
               console.log('当前用户角色', _this2.role);
-              _context.next = 45;
+              _context.next = 47;
               break;
-            case 32:
+            case 34:
               _context.t1 = res.data.type;
-              _context.next = _context.t1 === 0 ? 35 : _context.t1 === 1 ? 37 : _context.t1 === 2 ? 39 : _context.t1 === 3 ? 41 : _context.t1 === 4 ? 43 : 45;
+              _context.next = _context.t1 === 0 ? 37 : _context.t1 === 1 ? 39 : _context.t1 === 2 ? 41 : _context.t1 === 3 ? 43 : _context.t1 === 4 ? 45 : 47;
               break;
-            case 35:
-              _this2.role = 'nomal';
-              return _context.abrupt("break", 45);
             case 37:
-              _this2.role = 'superAdmin';
-              return _context.abrupt("break", 45);
+              _this2.role = 'nomal';
+              return _context.abrupt("break", 47);
             case 39:
-              _this2.role = 'sjkf';
-              return _context.abrupt("break", 45);
+              _this2.role = 'superAdmin';
+              return _context.abrupt("break", 47);
             case 41:
-              _this2.role = 'shkf';
-              return _context.abrupt("break", 45);
+              _this2.role = 'sjkf';
+              return _context.abrupt("break", 47);
             case 43:
-              _this2.role = 'yw';
-              return _context.abrupt("break", 45);
+              _this2.role = 'shkf';
+              return _context.abrupt("break", 47);
             case 45:
+              _this2.role = 'yw';
+              return _context.abrupt("break", 47);
+            case 47:
               console.log('当前员工角色', _this2.role);
               _this2.checkRole();
               _this2.loading = false;
-              _context.next = 51;
+              _context.next = 53;
               break;
-            case 50:
+            case 52:
               uni.showToast({
                 title: res.message,
                 icon: 'none'
               });
-            case 51:
+            case 53:
             case "end":
               return _context.stop();
           }

unpackage/dist/dev/mp-weixin/pages/my/userInfo/index.js

@@ -394,6 +394,7 @@ var _default = {
           if (res.confirm) {
             uni.removeStorageSync('token');
             uni.setStorageSync('switchs', [1, 0, 0]);
+            uni.removeStorageSync('priceConfig');
             uni.reLaunch({
               url: '/pages/my'
             });

unpackage/dist/dev/mp-weixin/pages/service.js

@@ -180,6 +180,7 @@ exports.default = void 0;
 var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 32));
 var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 34));
 var _index = __webpack_require__(/*! @/api/test/index.js */ 178);
+var _config = _interopRequireDefault(__webpack_require__(/*! @/common/config.js */ 35));
 //
 //
 //
@@ -274,6 +275,24 @@ var _default = {
       }, _callee);
     }))();
   },
+  onShow: function onShow() {
+    // if (!uni.getStorageSync('switchs')) {
+    uni.setStorageSync('switchs', [1, 0, 0]);
+    // }
+    // if (!uni.getStorageSync('priceConfig')) {
+    uni.request({
+      url: _config.default.baseUrl + '/api/common/getPriceConfig',
+      method: "GET",
+      success: function success(res) {
+        if (res.data.code == 0) {
+          console.log('my中获取的会员折扣数据', res.data.data);
+          uni.setStorageSync('priceConfig', res.data.data);
+        }
+      }
+    });
+    // }
+  },
+
   methods: {
     goDetail: function goDetail(content, title, item) {
       getApp().serCon = content;

unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-status-bar/u-status-bar.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }