shish %!s(int64=5) %!d(string=hai) anos
pai
achega
35430fe1d0

+ 23 - 0
hdApp/dist/build/mp-weixin/project.private.config.json

@@ -0,0 +1,23 @@
+{
+  "condition": {
+    "plugin": {
+      "list": []
+    },
+    "game": {
+      "list": []
+    },
+    "gamePlugin": {
+      "list": []
+    },
+    "miniprogram": {
+      "list": [
+        {
+          "name": "pagesPurchase/ghsProduct",
+          "pathName": "pagesPurchase/ghsProduct",
+          "query": "id=177",
+          "scene": null
+        }
+      ]
+    }
+  }
+}

+ 2 - 1
mallApp/dist/build/mp-weixin/app.json

@@ -117,5 +117,6 @@
   },
   },
   "usingComponents": {
   "usingComponents": {
     "tab-bar": "/components/app-tabbar"
     "tab-bar": "/components/app-tabbar"
-  }
+  },
+  "sitemapLocation": "sitemap.json"
 }
 }

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
mallApp/dist/build/mp-weixin/common/vendor.js


+ 2 - 2
mallApp/dist/build/mp-weixin/components/app-coupon-sel.json

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

+ 2 - 2
mallApp/dist/build/mp-weixin/components/module/app-vip.json

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

+ 2 - 2
mallApp/dist/build/mp-weixin/components/plugin/list-cell.json

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

+ 2 - 2
mallApp/dist/build/mp-weixin/components/plugin/rate.json

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

+ 2 - 2
mallApp/dist/build/mp-weixin/components/plugin/tabs.json

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

+ 33 - 6
mallApp/dist/build/mp-weixin/project.config.json

@@ -5,27 +5,54 @@
   },
   },
   "setting": {
   "setting": {
     "urlCheck": false,
     "urlCheck": false,
-    "es6": true
+    "es6": true,
+    "enhance": true,
+    "postcss": true,
+    "preloadBackgroundData": false,
+    "minified": true,
+    "newFeature": false,
+    "coverView": true,
+    "nodeModules": false,
+    "autoAudits": false,
+    "showShadowRootInWxmlPanel": true,
+    "scopeDataCheck": false,
+    "uglifyFileName": false,
+    "checkInvalidKey": true,
+    "checkSiteMap": true,
+    "uploadWithSourceMap": true,
+    "compileHotReLoad": false,
+    "lazyloadPlaceholderEnable": false,
+    "useMultiFrameRuntime": true,
+    "useApiHook": true,
+    "useApiHostProcess": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "enableEngineNative": false,
+    "useIsolateContext": true,
+    "userConfirmedBundleSwitch": false,
+    "packNpmManually": false,
+    "packNpmRelationList": [],
+    "minifyWXSS": true,
+    "showES6CompileOption": false
   },
   },
   "compileType": "miniprogram",
   "compileType": "miniprogram",
   "libVersion": "",
   "libVersion": "",
   "appid": "wx99a1dfc4171efb42",
   "appid": "wx99a1dfc4171efb42",
-  "projectname": "商城",
+  "projectname": "%E5%95%86%E5%9F%8E",
   "condition": {
   "condition": {
     "search": {
     "search": {
-      "current": -1,
       "list": []
       "list": []
     },
     },
     "conversation": {
     "conversation": {
-      "current": -1,
       "list": []
       "list": []
     },
     },
     "game": {
     "game": {
-      "current": -1,
       "list": []
       "list": []
     },
     },
     "miniprogram": {
     "miniprogram": {
-      "current": -1,
       "list": []
       "list": []
     }
     }
   }
   }

+ 44 - 29
mallApp/src/plugins/luch-request_0.0.7/request.js

@@ -10,6 +10,7 @@ import qs from 'qs'
 import constant from '@/constant/index'
 import constant from '@/constant/index'
 // import common from '@/utils/common'
 // import common from '@/utils/common'
 import { parse, getCheckLogin } from '@/utils/util'
 import { parse, getCheckLogin } from '@/utils/util'
+import store from '@/store'
 
 
 const Base64 = require('js-base64').Base64
 const Base64 = require('js-base64').Base64
 class Request {
 class Request {
@@ -167,41 +168,55 @@ class Request {
 							}
 							}
 							reject(response.data)
 							reject(response.data)
 						} else if (response.data.code && response.data.code == -1) {
 						} else if (response.data.code && response.data.code == -1) {
-							// 无权限或者登录过期
 							uni.removeStorageSync('token')
 							uni.removeStorageSync('token')
+							store.commit('setLoginInfo', {})
+
+							uni.showToast({
+								title: '加载中...',
+								icon: 'none',
+								mask: true
+							})
 							
 							
-							if(noLogin.indexOf(currentPages) == -1){
-								uni.showToast({
-									title: '登录过期,正在重新登录...',
-									icon: 'none',
-									mask: true
-								})
+							let account = uni.getStorageSync('account')
+							if(account){
+								setTimeout(() => {
+									uni.reLaunch({
+										url: '/'+currentPages+'?account='+account
+									})
+								}, 1000)
+							}else{
+								setTimeout(() => {
+									uni.reLaunch({
+										url: `/pages/home/recent`
+									})
+								}, 1000)
 							}
 							}
-							
-							setTimeout(() => {
-								getCheckLogin()
-								uni.reLaunch({
-									url: `/pages/home/index`
-								})
-							}, 1000)
+
 						} else if (response.data.code == 2) {
 						} else if (response.data.code == 2) {
 							uni.removeStorageSync('token')
 							uni.removeStorageSync('token')
-							uni.removeStorageSync('shopUser')
-							uni.removeStorageSync('account')
-							if(noLogin.indexOf(currentPages) == -1){
-								uni.showToast({
-									title: '登录失效,正在重新登录...',
-									icon: 'none',
-									mask: true
-								})
-							}
+							store.commit('setLoginInfo', {})
 							
 							
-							setTimeout(() => {
-								getCheckLogin()
-								uni.reLaunch({
-									url: `/pages/home/index`
-								})
-							}, 1000)
+							uni.showToast({
+								title: '加载中...',
+								icon: 'none',
+								mask: true
+							})
+							
+							let account = uni.getStorageSync('account')
+							if(account){
+								setTimeout(() => {
+									uni.reLaunch({
+										url: '/'+currentPages+'?account='+account
+									})
+								}, 1000)
+							}else{
+								setTimeout(() => {
+									uni.reLaunch({
+										url: `/pages/home/recent`
+									})
+								}, 1000)
+							}
+
 						} else {
 						} else {
 							console.log('response.data', response.data)
 							console.log('response.data', response.data)
 							if (!config.hideError) {
 							if (!config.hideError) {

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio