fix

virgo.wzfrontend/shop/shop-admin/src/utils/request.js

@@ -1,98 +1,108 @@
-import axios from 'axios'
-import { MessageBox, Message } from 'element-ui'
-import store from '@/store'
-import { getToken } from '@/utils/auth'
-import router from '@/router'
-// create an axios instance
-const service = axios.create({
-  baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
-  withCredentials: false, // send cookies when cross-domain requests
-  timeout: 30000 // request timeout
-})
-
-// request interceptor
-service.interceptors.request.use(
-  config => {
-    // do something before request is sent
-    var token = getToken()
-    if (token) {
-      config.headers['Authorization'] = token // 让每个请求携带自定义token 请根据实际情况自行修改
-    }
-    return config
-  },
-  error => {
-    // do something with request error
-    return Promise.reject(error)
-  }
-)
-
-// response interceptor
-service.interceptors.response.use(
-  /**
-   * If you want to get http information such as headers or status
-   * Please return  response => response
-  */
-
-  /**
-   * Determine the request status by custom code
-   * Here is just an example
-   * You can also judge the status by HTTP Status Code
-   */
-  response => {
-    const res = response.data
-    if(response.headers.token){
-      //如果后台通过header返回token，说明token已经更新，则更新客户端本地token
-      store.dispatch('user/updateToken',{token:response.headers.token})
-    }
-    // if the custom code is not 20000, it is judged as an error.
-    if (res.code !== 20000) {
-      Message({
-        message: res.msg || 'error',
-        type: 'error',
-        duration: 5 * 1000
-      })
-
-      // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
-      if (res.code === 50008 || res.code === 50012 || res.code === 50014) {
-        // to re-login
-        MessageBox.confirm('You have been logged out, you can cancel to stay on this page, or log in again', 'Confirm logout', {
-          confirmButtonText: 'Re-Login',
-          cancelButtonText: 'Cancel',
-          type: 'warning'
-        }).then(() => {
-          store.dispatch('user/resetToken').then(() => {
-            location.reload()
-          })
-        })
-      }
-      return Promise.reject(res)
-    } else {
-      return res
-    }
-  },
-  error => {
-    if(error.response.status === 401){
-      store.dispatch('user/logout').then(()=>{
-        router.replace({
-          path: '/login',
-          query:{redirect:router.currentRoute.path}
-        })
-      })
-      return
-    }
-    let errorMsg = ''
-    try {
-       errorMsg = error.response.data.errors[0].defaultMessage
-    }catch (e) {
-      errorMsg =  error.response.data.message
-    }
-    Message({
-      message: errorMsg,
-      type: 'error',
-      duration: 5 * 1000
-    })
-    return Promise.reject(error)
-  }
-)
-
+import axios from 'axios'
+import {
+  MessageBox,
+  Message
+} from 'element-ui'
+import store from '@/store'
+import {
+  getToken
+} from '@/utils/auth'
+import router from '@/router'
+// create an axios instance
+const service = axios.create({
+  baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
+  withCredentials: false, // send cookies when cross-domain requests
+  timeout: 30000 // request timeout
+})
+
+// request interceptor
+service.interceptors.request.use(
+  config => {
+    // do something before request is sent
+    var token = getToken()
+    if (token) {
+      config.headers['Authorization'] = token // 让每个请求携带自定义token 请根据实际情况自行修改
+    }
+    return config
+  },
+  error => {
+    // do something with request error
+    return Promise.reject(error)
+  }
+)
+
+// response interceptor
+service.interceptors.response.use(
+  /**
+   * If you want to get http information such as headers or status
+   * Please return  response => response
+   */
+
+  /**
+   * Determine the request status by custom code
+   * Here is just an example
+   * You can also judge the status by HTTP Status Code
+   */
+  response => {
+    const res = response.data
+    if (response.headers.token) {
+      //如果后台通过header返回token，说明token已经更新，则更新客户端本地token
+      store.dispatch('user/updateToken', {
+        token: response.headers.token
+      })
+    }
+    // if the custom code is not 200, it is judged as an error.
+    if (res.code !== 200) {
+      Message({
+        message: res.msg || 'error',
+        type: 'error',
+        duration: 5 * 1000
+      })
+
+      // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
+      if (res.code === 50008 || res.code === 50012 || res.code === 50014) {
+        // to re-login
+        MessageBox.confirm('You have been logged out, you can cancel to stay on this page, or log in again',
+          'Confirm logout', {
+            confirmButtonText: 'Re-Login',
+            cancelButtonText: 'Cancel',
+            type: 'warning'
+          }).then(() => {
+          store.dispatch('user/resetToken').then(() => {
+            location.reload()
+          })
+        })
+      }
+      return Promise.reject(res)
+    } else {
+      return res
+    }
+  },
+  error => {
+    if (error.response.status === 401) {
+      store.dispatch('user/logout').then(() => {
+        router.replace({
+          path: '/login',
+          query: {
+            redirect: router.currentRoute.path
+          }
+        })
+      })
+      return
+    }
+    let errorMsg = ''
+    try {
+      errorMsg = error.response.data.errors[0].defaultMessage
+    } catch (e) {
+      errorMsg = error.response.data.message
+    }
+    Message({
+      message: errorMsg,
+      type: 'error',
+      duration: 5 * 1000
+    })
+    return Promise.reject(error)
+  }
+)
+
 export default service

virgo.wzfrontend/shop/shop-admin/vue.config.js

@@ -1,131 +1,120 @@
 'use strict'
 const path = require('path')
-const defaultSettings = require('./src/settings.js')
 
 function resolve(dir) {
-  return path.join(__dirname, dir)
+	return path.join(__dirname, dir)
 }
-
-const name = defaultSettings.title || '后台管理' // page title
-// If your port is set to 80,
-// use administrator privileges to execute the command line.
-// For example, Mac: sudo npm run
 const port = 8000 // dev port
-
-// All configuration item explanations can be find in https://cli.vuejs.org/config/
+const name = 'shop'
 module.exports = {
-    /**
-     * You will need to set publicPath if you plan to deploy your site under a sub path,
-     * for example GitHub Pages. If you plan to deploy your site to https://foo.github.io/bar/,
-     * then publicPath should be set to "/bar/".
-     * In most cases please use '/' !!!
-     * Detail: https://cli.vuejs.org/config/#publicpath
-     */
-    publicPath: '/',
-    outputDir: 'dist',
-    assetsDir: 'static',
-    lintOnSave: false,
-    productionSourceMap: false,
-    devServer: {
-      port: port,
-      open: true,
-      overlay: {
-        warnings: false,
-        errors: true
-      },
-      proxy: {
-        [process.env.VUE_APP_BASE_API]: {
-          target: `https://www.workark.com/prod-api/admin-api`,
-          changeOrigin: true, // target是域名的话，需要这个参数
-          pathRewrite: ['^' + process.env.VUE_APP_BASE_API]: ''
-        }
-      }
-    }
-  },
-  configureWebpack: {
-    // provide the app's title in webpack's name field, so that
-    // it can be accessed in index.html to inject the correct title.
-    name: name,
-    resolve: {
-      alias: {
-        '@': resolve('src')
-      }
-    }
-  },
-  chainWebpack(config) {
-    config.plugins.delete('preload')
-    config.plugins.delete('prefetch')
+	publicPath: '/',
+	outputDir: 'dist',
+	assetsDir: 'static',
+	lintOnSave: false,
+	productionSourceMap: false,
+	devServer: {
+		port: port,
+		open: true,
+		overlay: {
+			warnings: false,
+			errors: true
+		},
+		proxy: {
+			[process.env.VUE_APP_BASE_API]: {
+				target: `https://www.workark.com/prod-api/admin-api`, //不使用mock模拟数据直接请求flash-api服务
+				changeOrigin: true,
+				pathRewrite: {
+					['^' + process.env.VUE_APP_BASE_API]: ''
+				}
+			}
+		}
+		// after: require('./mock/mock-server.js')
+	},
+	configureWebpack: {
+		// provide the app's title in webpack's name field, so that
+		// it can be accessed in index.html to inject the correct title.
+		name: name,
+		resolve: {
+			alias: {
+				'@': resolve('src')
+			}
+		}
+	},
+	chainWebpack(config) {
+		config.plugins.delete('preload')
+		config.plugins.delete('prefetch')
+
+		// set svg-sprite-loader
+		config.module
+			.rule('svg')
+			.exclude.add(resolve('src/icons'))
+			.end()
+		config.module
+			.rule('icons')
+			.test(/\.svg$/)
+			.include.add(resolve('src/icons'))
+			.end()
+			.use('svg-sprite-loader')
+			.loader('svg-sprite-loader')
+			.options({
+				symbolId: 'icon-[name]'
+			})
+			.end()
+
+		// set preserveWhitespace
+		config.module
+			.rule('vue')
+			.use('vue-loader')
+			.loader('vue-loader')
+			.tap(options => {
+				options.compilerOptions.preserveWhitespace = true
+				return options
+			})
+			.end()
 
-    // set svg-sprite-loader
-    config.module
-      .rule('svg')
-      .exclude.add(resolve('src/icons'))
-      .end()
-    config.module
-      .rule('icons')
-      .test(/\.svg$/)
-      .include.add(resolve('src/icons'))
-      .end()
-      .use('svg-sprite-loader')
-      .loader('svg-sprite-loader')
-      .options({
-        symbolId: 'icon-[name]'
-      })
-      .end()
+		config
+			// https://webpack.js.org/configuration/devtool/#development
+			.when(process.env.NODE_ENV === 'development',
+				config => config.devtool('cheap-source-map')
+			)
 
-    // set preserveWhitespace
-    config.module
-      .rule('vue')
-      .use('vue-loader')
-      .loader('vue-loader')
-      .tap(options => {
-        options.compilerOptions.preserveWhitespace = true
-        return options
-      })
-      .
-    end()
-    config
-      // https://webpack.js.org/configuration/devtool/#development
-      .when(process.env.NODE_ENV === 'development',
-        config => config.devtool('cheap-source-map')
-      )
-    config
-      .when(process.env.NODE_ENV !== 'development',
-        config => {
-          config
-            .plugin('ScriptExtHtmlWebpackPlugin')
-            .after('html')
-            .use('script-ext-html-webpack-plugin', [{
-              // `runtime` must same as runtimeChunk name. default is `runtime`
-              inline: /runtime\..*\.js$/
-            }])
-            .end()
-          config
-            .optimization.splitChunks({
-              chunks: 'all',
-              cacheGroups: {
-                libs: {
-                  name: 'chunk-libs',
-                  test: /[\\/]node_modules[\\/]/,
-                  priority: 10,
-                  chunks: 'initial' // only package third parties that are initially dependent
-                },
-                elementUI: {
-                  name: 'chunk-elementUI', // split elementUI into a single package
-                  priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
-                  test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
-                },
-                commons: {
-                  name: 'chunk-commons',
-                  test: resolve('src/components'), // can customize your rules
-                  minChunks: 3, //  minimum common number
-                  priority: 5,
-                  reuseExistingChunk: true
-                }
-              }
-            })
-          config.optimization.runtimeChunk('single')
-        }
-      )
-  }
+		config
+			.when(process.env.NODE_ENV !== 'development',
+				config => {
+					config
+						.plugin('ScriptExtHtmlWebpackPlugin')
+						.after('html')
+						.use('script-ext-html-webpack-plugin', [{
+							// `runtime` must same as runtimeChunk name. default is `runtime`
+							inline: /runtime\..*\.js$/
+						}])
+						.end()
+					config
+						.optimization.splitChunks({
+							chunks: 'all',
+							cacheGroups: {
+								libs: {
+									name: 'chunk-libs',
+									test: /[\\/]node_modules[\\/]/,
+									priority: 10,
+									chunks: 'initial' // only package third parties that are initially dependent
+								},
+								elementUI: {
+									name: 'chunk-elementUI', // split elementUI into a single package
+									priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
+									test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
+								},
+								commons: {
+									name: 'chunk-commons',
+									test: resolve('src/components'), // can customize your rules
+									minChunks: 3, //  minimum common number
+									priority: 5,
+									reuseExistingChunk: true
+								}
+							}
+						})
+					config.optimization.runtimeChunk('single')
+				}
+			)
+	}
 }

virgo.wzfrontend/shop/shop-mobile/src/App.vue

@@ -10,14 +10,18 @@
 	export default {
 		watch: {
 			$route(newValue, oldValue) {
-				let token = this.$route.query.token;
-				let code = this.$route.query.code;
-				if (token) {
+				this.$wxEnv(() => {
+					let token = this.$route.query.token;
+					let code = this.$route.query.code;
 					store.dispatch('app/toggleToken', token);
-					userApi.getUserInfo().then(response => {
-						store.dispatch('app/toggleUser', response.data);
-					})
-				}
+					if (token) {
+						userApi.getUserInfo().then(response => {
+							store.dispatch('app/toggleUser', response.data);
+						})
+					} else {
+						store.dispatch('app/toggleUser', {})
+					}
+				})
 			}
 		},
 	}

virgo.wzfrontend/shop/shop-mobile/src/api/user.js

@@ -1,68 +1,78 @@
-import request from '@/utils/request'
-
-export default {
-    getUserInfo: function () {
-        return request({
-            url: '/user/getInfo',
-            method: 'get'
-        })
-    },
-    updateUserName: function (userName) {
-        const params = {userName:userName}
-        return request({
-            url: '/user/updateUserName/',
-            method: 'post',
-            params
-        })
-    },
-    updatePwd: function (params) {
-        return request({
-            url: '/account/updatePwd',
-            method: 'post',
-            params
-        })
-    },
-    updateGender:function(gender) {
-        return request({
-            url: '/user/updateGender/' + gender,
-            method: 'post'
-        })
-    },
-    updatePassword:function(oldPwd,password,rePassword) {
-        return request({
-            url: '/user/updatePassword/' + oldPwd+'/'+password+'/'+rePassword,
-            method: 'post'
-        })
-    },
-    upload:function(file){
-        return request({
-            url: '/file/upload/base64',
-            method: 'post',
-            data:file
-        })
-    },
-    sendSmsCode:function(mobile) {
-        return request({
-            url: '/user/sendSmsCode',
-            method: 'post',
-            params: {
-                "mobile": mobile
-            }
-        })
-    },
-    getWxSign:function(params){
-        return request({
-            url: '/user/getWxSign',
-            method: 'post',
-            params
-        })
-    },
-    getWxOpenId:function(params){
-        return request({
-            url: '/user/getWxOpenId',
-            method: 'post',
-            params
-        })
-    }
-}
-
+import request from '@/utils/request'
+
+export default {
+	getUserInfo: function() {
+		return request({
+			url: '/user/getInfo',
+			method: 'get'
+		})
+	},
+	updateUserName: function(userName) {
+		const params = {
+			userName: userName
+		}
+		return request({
+			url: '/user/updateUserName',
+			method: 'post',
+			params
+		})
+	},
+	updateUserOpenId: function(openId) {
+		const params = {
+			openId: openId
+		}
+		return request({
+			url: '/user/updateOpenId/' + openId,
+			method: 'post'
+		})
+	},
+	updatePwd: function(params) {
+		return request({
+			url: '/account/updatePwd',
+			method: 'post',
+			params
+		})
+	},
+	updateGender: function(gender) {
+		return request({
+			url: '/user/updateGender/' + gender,
+			method: 'post'
+		})
+	},
+	updatePassword: function(oldPwd, password, rePassword) {
+		return request({
+			url: '/user/updatePassword/' + oldPwd + '/' + password + '/' + rePassword,
+			method: 'post'
+		})
+	},
+	upload: function(file) {
+		return request({
+			url: '/file/upload/base64',
+			method: 'post',
+			data: file
+		})
+	},
+	sendSmsCode: function(mobile) {
+		return request({
+			url: '/user/sendSmsCode',
+			method: 'post',
+			params: {
+				"mobile": mobile
+			}
+		})
+	},
+	getWxSign: function(params) {
+		return request({
+			url: '/user/getWxSign',
+			method: 'post',
+			params
+		})
+	},
+	getWxOpenId: function(params) {
+		return request({
+			url: '/user/getWxOpenId',
+			method: 'post',
+			params
+		})
+	}
+}

virgo.wzfrontend/shop/shop-mobile/src/main.js

@@ -15,13 +15,13 @@ const wxEnv = (successCallback, failBack) => {
 	if (ua.match(/MicroMessenger/i) == "micromessenger") {
 		wx.miniProgram.getEnv((res) => {
 			if (res.miniprogram) {
-				successCallback();
+				if (successCallback) successCallback();
 			} else {
 				alert("不在小程序里");
 			}
 		})
 	} else {
-		failBack();
+		if (failBack) failBack();
 	}
 }
 Vue.prototype.$wxEnv = wxEnv;

virgo.wzfrontend/shop/shop-mobile/src/utils/request.js

@@ -93,7 +93,6 @@ service.interceptors.response.use(
 									redirect: router.currentRoute.path
 								}
 							})
-
 							return Promise.reject(error.response.data.message)
 						} else {
 							Toast.fail(error.response.data.message)

virgo.wzfrontend/shop/shop-mobile/src/view/order/checkout/checkout.js

@@ -97,13 +97,17 @@ export default {
 				message: this.message,
 				idCarts: this.idCartList.join(',')
 			}).then(response => {
-				let order = response.data
-				this.$router.push({
-					path: 'payment',
-					query: {
-						orderSn: order.orderSn,
-						totalPrice: order.totalPrice
-					}
+				let order = response.data;
+				this.$wxEnv(() => {
+					wx.miniProgram.navigateTo({
+						url: '/subPages/shopPage/payment/payment?orderSn=' + order.orderSn +
+							'&totalPrice=' + order.totalPrice
+					})
+				}, () => {
+					this.router.push({
+						path: '/payment?orderSn=' + order.orderSn + '&totalPrice=' + order
+							.totalPrice
+					})
 				})
 			})
 		},

virgo.wzfrontend/shop/shop-mobile/src/view/order/detail/detail.js

@@ -1,70 +1,105 @@
-import order  from '@/api/orders'
-import { Cell, CellGroup,Row, Col,Checkbox, CheckboxGroup, Card, SubmitBar, Toast, NavBar, Tab,Tabs,Tabbar, TabbarItem,Panel,List,Button    } from 'vant';
-const baseApi = process.env.VUE_APP_BASE_API
-
-export default {
-    components: {
-        [Cell.name]: Cell,
-        [CellGroup.name]: CellGroup,
-        [Row.name]: Row,
-        [Col.name]: Col,
-        [Card.name]: Card,
-        [Checkbox.name]: Checkbox,
-        [SubmitBar.name]: SubmitBar,
-        [CheckboxGroup.name]: CheckboxGroup,
-        [NavBar.name]: NavBar,
-        [Tab.name]:Tab,
-        [Tabbar.name]: Tabbar,
-        [Tabs.name]: Tabs,
-        [TabbarItem.name]: TabbarItem,
-        [Panel.name]: Panel,
-        [List.name]:List,
-        [Button.name]:Button
-
-    },
-
-    data() {
-        return {
-            activeFooter: 3,
-            title:'',
-            imgUrl:baseApi+'/file/getImgStream?idFile=',
-            order:{orderSn:'',address:{name:''}}
-        };
-    },
-    mounted(){
-        this.init()
-    },
-    methods: {
-        init(){
-            this.order.orderSn = this.$route.params.orderSn
-            this.getData()
-
-        },
-        getData(){
-            order.get(this.order.orderSn).then( response => {
-                this.order = response.data
-            })
-        },
-        formatPrice(price) {
-            return (price / 100).toFixed(2);
-        },
-        toGoods(id){
-            this.$router.push({path: '/goods/'+id})
-        },
-        confirmReceive(){
-            Toast('敬请期待')
-            order.confirm(this.order.orderSn).then( response => {
-                this.order = response.data
-            })
-        },
-        payment(){
-            this.$router.push({path:'/payment',query:{orderSn:this.order.orderSn,totalPrice:this.order.totalPrice}})
-        },
-        contact(){
-          Toast('敬请期待')
-        },
-        onClickLeft(){
-            this.$router.go(-1)
-        },
-    }
-}
+import order from '@/api/orders'
+import {
+	Cell,
+	CellGroup,
+	Row,
+	Col,
+	Checkbox,
+	CheckboxGroup,
+	Card,
+	SubmitBar,
+	Toast,
+	NavBar,
+	Tab,
+	Tabs,
+	Tabbar,
+	TabbarItem,
+	Panel,
+	List,
+	Button
+} from 'vant';
+const baseApi = process.env.VUE_APP_BASE_API
+
+export default {
+	components: {
+		[Cell.name]: Cell,
+		[CellGroup.name]: CellGroup,
+		[Row.name]: Row,
+		[Col.name]: Col,
+		[Card.name]: Card,
+		[Checkbox.name]: Checkbox,
+		[SubmitBar.name]: SubmitBar,
+		[CheckboxGroup.name]: CheckboxGroup,
+		[NavBar.name]: NavBar,
+		[Tab.name]: Tab,
+		[Tabbar.name]: Tabbar,
+		[Tabs.name]: Tabs,
+		[TabbarItem.name]: TabbarItem,
+		[Panel.name]: Panel,
+		[List.name]: List,
+		[Button.name]: Button
+
+	},
+
+	data() {
+		return {
+			activeFooter: 3,
+			title: '',
+			imgUrl: baseApi + '/file/getImgStream?idFile=',
+			order: {
+				consignee: '',
+				mobile: '',
+				orderSn: '',
+				address: {
+					name: ''
+				}
+			}
+		};
+	},
+	mounted() {
+		this.init()
+	},
+	methods: {
+		init() {
+			this.order.orderSn = this.$route.params.orderSn
+			this.getData()
+
+		},
+		getData() {
+			order.get(this.order.orderSn).then(response => {
+				this.order = response.data
+			})
+		},
+		formatPrice(price) {
+			if (!price) return '';
+			return (price / 100).toFixed(2);
+		},
+		toGoods(id) {
+			this.$linkTo('/goods/' + id);
+		},
+		confirmReceive() {
+			order.confirm(this.order.orderSn).then(response => {
+				this.order = response.data
+			})
+		},
+		payment() {
+			this.$wxEnv(() => {
+				wx.miniProgram.navigateTo({
+					url: '/subPages/shopPage/payment/payment?orderSn=' + this.order.orderSn +
+						'&totalPrice=' + this.order.totalPrice
+				})
+			}, () => {
+				this.router.push({
+					path: '/payment?orderSn=' + this.order.orderSn + '&totalPrice=' + this.order
+						.totalPrice
+				})
+			});
+		},
+		contact() {
+			Toast('敬请期待')
+		},
+		onClickLeft() {
+			this.$router.go(-1)
+		},
+	}
+}

virgo.wzfrontend/shop/shop-mobile/src/view/order/detail/index.vue

@@ -1,83 +1,66 @@
-<template>
-    <div>
-        <van-nav-bar
-                title="订单详情"
-                left-arrow
-                @click-left="onClickLeft"
-        />
-        <div class="order_detail">
-            <van-panel :title="order.consignee +' '+  order.mobile" :status="order.statusName">
-                <div class="address_detail">
-                    {{order.consigneeAddress}}
-                    <br>
-                </div>
-                <div slot="footer"
-                     class="footer_btn">
-                    <van-button size="small" type="default" @click="contact">联系客服</van-button>
-                    <van-button size="small" type="danger" @click="payment" v-show="order.statusName=='待付款'">立即付款</van-button>
-                    <van-button size="small" type="danger" @click="confirmReceive" v-show="order.statusName=='已发货'">确认收货</van-button>
-                </div>
-            </van-panel>
-            <van-panel :title="'订单编号: ' + order.orderSn">
-                <van-card v-for="(orderItem, index) in order.items"
-                          :key="index"
-                          :title="orderItem.goods.name"
-                          :desc="orderItem.goods.descript"
-                          :price="formatPrice(orderItem.price)"
-                          :num="orderItem.count"
-                          @click="toGoods(orderItem.goods.id)"
-                          :thumb="imgUrl+orderItem.goods.pic">
-
-                </van-card>
-                <div class="total">合计: {{formatPrice(order.totalPrice)}}</div>
-
-            </van-panel>
-            <van-panel title="订单信息" >
-                <van-cell-group>
-                    <van-cell title="订单编号" :value="order.orderSn" />
-                    <van-cell title="备注" :value="order.message"   />
-                    <van-cell title="创建时间" :value="order.createTime"/>
-                </van-cell-group>
-            </van-panel>
-            <br><br><br>
-        </div>
-
-
-        <van-tabbar v-model="activeFooter">
-            <van-tabbar-item icon="home-o" replace to="/index">首页</van-tabbar-item>
-            <van-tabbar-item icon="search" replace to="/search">发现</van-tabbar-item>
-            <van-tabbar-item icon="cart-o" replace to="/cart">购物车</van-tabbar-item>
-            <van-tabbar-item icon="user-o" replace to="/user">我的</van-tabbar-item>
-        </van-tabbar>
-    </div>
-</template>
-
-<script src="./detail.js"></script>
-
-<style lang="less">
-    .order_detail {
-        .van-panel {
-            margin-top: 5px;
-        }
-
-        .van-card {
-            background-color: #fff;
-        }
-
-        .total {
-            text-align: right;
-            padding: 10px;
-        }
-
-        .footer_btn {
-            text-align: right;
-
-            .van-button {
-                margin-left: 10px;
-            }
-        }
-        .address_detail{
-            padding: 5px;
-        }
-    }
-</style>
+<template>
+	<div>
+		<div class="order_detail">
+			<van-panel :title="order.consignee +' '+  order.mobile" :status="order.statusName">
+				<div class="address_detail">
+					{{order.consigneeAddress}}
+					<br>
+				</div>
+				<div slot="footer" class="footer_btn">
+					<van-button size="small" type="danger" @click="payment" v-show="order.statusName=='待付款'">
+						立即付款
+					</van-button>
+					<van-button size="small" type="danger" @click="confirmReceive" v-show="order.statusName=='已发货'">
+						确认收货
+					</van-button>
+				</div>
+			</van-panel>
+			<van-panel :title="'订单编号: ' + order.orderSn">
+				<van-card v-for="(orderItem, index) in order.items" :key="index" :title="orderItem.goods.name"
+					:desc="orderItem.goods.descript" :price="formatPrice(orderItem.price)" :num="orderItem.count"
+					@click="toGoods(orderItem.goods.id)" :thumb="imgUrl+orderItem.goods.pic">
+				</van-card>
+				<div class="total">合计: {{formatPrice(order.totalPrice)}}</div>
+			</van-panel>
+			<van-panel title="订单信息">
+				<van-cell-group>
+					<van-cell title="订单编号" :value="order.orderSn" />
+					<van-cell title="备注" :value="order.message" />
+					<van-cell title="创建时间" :value="order.createTime" />
+				</van-cell-group>
+			</van-panel>
+			<br><br><br>
+		</div>
+	</div>
+</template>
+
+<script src="./detail.js"></script>
+
+<style lang="less">
+	.order_detail {
+		.van-panel {
+			margin-top: 5px;
+		}
+
+		.van-card {
+			background-color: #fff;
+		}
+
+		.total {
+			text-align: right;
+			padding: 10px;
+		}
+
+		.footer_btn {
+			text-align: right;
+
+			.van-button {
+				margin-left: 10px;
+			}
+		}
+
+		.address_detail {
+			padding: 15px;
+		}
+	}
+</style>

virgo.wzfrontend/shop/shop-mobile/src/view/order/expressInfo/expressInfo.js

@@ -1,50 +1,47 @@
-import order  from '@/api/orders'
-import { Cell, CellGroup,Row, Col,Step, Steps, NavBar, Tab,Tabs,Tabbar, TabbarItem,Button    } from 'vant';
-const baseApi = process.env.VUE_APP_BASE_API
-
-export default {
-    components: {
-        [Cell.name]: Cell,
-        [CellGroup.name]: CellGroup,
-        [Row.name]: Row,
-        [Col.name]: Col,
-        [Step.name]: Step,
-        [Steps.name]: Steps,
-        [NavBar.name]: NavBar,
-        [Tab.name]:Tab,
-        [Tabbar.name]: Tabbar,
-        [Tabs.name]: Tabs,
-        [TabbarItem.name]: TabbarItem,
-        [Button.name]:Button
-
-    },
-
-    data() {
-        return {
-            activeFooter: 3,
-            title:'',
-            order:{orderSn:'',address:{name:''}},
-            expressInfo:{}
-        };
-    },
-    mounted(){
-        this.init()
-    },
-    methods: {
-        init(){
-            this.order.orderSn = this.$route.params.orderSn
-            this.getData()
-
-        },
-        getData(){
-            order.getExpressInfo(this.order.orderSn).then( response => {
-                this.order = response.data.order
-                this.expressInfo = response.data.expressInfo
-                this.title = this.order.orderSn+'('+this.order.statusName+')'
-            })
-        },
-        onClickLeft(){
-            this.$router.go(-1)
-        },
-    }
-}
+import order from '@/api/orders'
+import {
+	Step,
+	Steps,
+	Toast
+} from 'vant';
+export default {
+	components: {
+		[Step.name]: Step,
+		[Steps.name]: Steps,
+	},
+	data() {
+		return {
+			activeFooter: 3,
+			title: '',
+			order: {
+				orderSn: '',
+				address: {
+					name: ''
+				}
+			},
+			expressInfo: {}
+		};
+	},
+	mounted() {
+		this.init()
+	},
+	methods: {
+		init() {
+			this.order.orderSn = this.$route.params.orderSn;
+			Toast.loading({
+				message: '物流查询中',
+				forbidClick: true,
+				duration: 0
+			});
+			this.getData()
+		},
+		getData() {
+			order.getExpressInfo(this.order.orderSn).then(response => {
+				Toast.clear();
+				this.order = response.data.order
+				this.expressInfo = response.data.expressInfo
+				this.title = this.order.orderSn + '(' + this.order.statusName + ')'
+			})
+		}
+	}
+}

virgo.wzfrontend/shop/shop-mobile/src/view/order/expressInfo/index.vue

@@ -1,65 +1,62 @@
-<template>
-    <div>
-        <van-nav-bar
-                :title="title"
-                left-arrow
-                @click-left="onClickLeft"
-        />
-        <div class="expressInfo">
-            <van-steps direction="vertical" :active="0" class="traces">
-                <van-step v-for="(item, index) in expressInfo.infoList"
-                          :key="index">
-                    <h3 class="station">{{item.AcceptStation}}</h3>
-                    <p class="time">{{item.AcceptTime}}</p>
-                </van-step>
-            </van-steps>
-            <br><br><br>
-        </div>
-
-
-        <van-tabbar v-model="activeFooter">
-            <van-tabbar-item icon="home-o" replace to="/index">首页</van-tabbar-item>
-            <van-tabbar-item icon="search" replace to="/search">发现</van-tabbar-item>
-            <van-tabbar-item icon="cart-o" replace to="/cart">购物车</van-tabbar-item>
-            <van-tabbar-item icon="user-o" replace to="/user">我的</van-tabbar-item>
-        </van-tabbar>
-    </div>
-</template>
-
-<script src="./expressInfo.js"></script>
-
-<style lang="less">
-    .van-step--vertical{
-        padding:0px 10px 2px 0px;
-    }
-    .expressInfo {
-        .traces{
-           .station{
-               font-size:.8em;
-           }
-            .time{
-                font-size:.9em;
-            }
-        }
-        .van-panel {
-            margin-top: 5px;
-        }
-
-        .van-card {
-            background-color: #fff;
-        }
-
-        .total {
-            text-align: right;
-            padding: 10px;
-        }
-
-        .footer_btn {
-            text-align: right;
-
-            .van-button {
-                margin-left: 10px;
-            }
-        }
-    }
-</style>
+<template>
+	<div class="expressInfo-box">
+		<div class="title">{{title}}</div>
+		<div class="expressInfo">
+			<van-steps direction="vertical" :active="0" class="traces">
+				<van-step v-for="(item, index) in expressInfo.infoList" :key="index">
+					<h3 class="station">{{item.AcceptStation}}</h3>
+					<p class="time">{{item.AcceptTime}}</p>
+				</van-step>
+			</van-steps>
+			<br><br><br>
+		</div>
+	</div>
+</template>
+
+<script src="./expressInfo.js"></script>
+
+<style lang="less">
+	.expressInfo-box {
+
+		.title {
+			padding: 15px;
+		}
+	}
+
+	.van-step--vertical {
+		padding: 0px 10px 2px 0px;
+	}
+
+	.expressInfo {
+		.traces {
+			.station {
+				font-size: .8em;
+			}
+
+			.time {
+				font-size: .9em;
+			}
+		}
+
+		.van-panel {
+			margin-top: 5px;
+		}
+
+		.van-card {
+			background-color: #fff;
+		}
+
+		.total {
+			text-align: right;
+			padding: 10px;
+		}
+
+		.footer_btn {
+			text-align: right;
+
+			.van-button {
+				margin-left: 10px;
+			}
+		}
+	}
+</style>

virgo.wzfrontend/workark_wx/pages/login/login.vue

@@ -78,6 +78,10 @@
 		getUserInfo,
 		getOpenId
 	} from '@/request/api/login'
+
+	import {
+		updateWxOpenId
+	} from '@/request/api/shop'
 	import imageCode from "@/components/login/imageCode.vue";
 	import {
 		isPhoneNumber
@@ -176,12 +180,15 @@
 					title: '登录中...'
 				})
 				let loginData = await login(postData);
-				if (!loginData.state) return;
+				if (!loginData.state) return;
 				uni.setStorageSync('shopMobileToken', loginData.data.shopMobileToken);
 				uni.setStorageSync('token', loginData.data.token);
 				if (wxCode) {
 					let wxData = await getOpenId(wxCode);
-					if (wxData.state) uni.setStorageSync('openId', wxData.data.openid);
+					if (wxData.state) {
+						uni.setStorageSync('openId', wxData.data.openid);
+						updateWxOpenId(wxData.data.openid)
+					}
 				}
 				let userData = await getUserInfo();
 				if (!userData.state) return;

virgo.wzfrontend/workark_wx/pages/shop/shop.vue

@@ -12,7 +12,8 @@
 				webviewUrl: ''
 			}
 		},
-		onLoad(body) {
+		onLoad(body) {
+			
 			this.webviewUrl = config.webviewUrl + '/index?token=' + uni.getStorageSync('shopMobileToken');
 		},
 		methods: {}

virgo.wzfrontend/workark_wx/request/api/shop.js

@@ -3,7 +3,7 @@ import {
 } from '@/request/request.js';
 const baseUrl = '/prod-api/mobile-api';
 /* 
- * 获取订单信息
+ * 获取订单状态
  * 
  * 
  */
@@ -23,4 +23,15 @@ export function getPaymentInformation(orderSn) {
 		url: `${baseUrl}/pay/wx/prepare?orderSn=${orderSn}`,
 		method: 'post'
 	})
+}
+/* 
+ * 修改用户OpenId
+ * 
+ * 
+ */
+export function updateWxOpenId(openId) {
+	return request({
+		url: `${baseUrl}/user/updateOpenId/${openId}`,
+		method: 'post'
+	})
 }

virgo.wzfrontend/workark_wx/request/request.js

@@ -3,11 +3,7 @@ import store from "../store";
 import chat from '@/uitls/chat.js'
 const logout = () => {
 	chat.disConnect();
-	uni.removeStorageSync('token');
-	uni.removeStorageSync('chatToken');
-	uni.removeStorageSync('vuex_state');
-	uni.removeStorageSync('serveChatToken');
-	uni.removeStorageSync('serveChatId');
+	uni.clearStorageSync();
 	store.dispatch('app/changeOrganization', {});
 	store.dispatch('app/changeUser', {});
 	uni.removeTabBarBadge({

virgo.wzfrontend/workark_wx/subPages/indexPage/orderDetail/orderDetail.vue

@@ -146,11 +146,7 @@
 			},
 			logout() {
 				this.$chat.disConnect();
-				uni.removeStorageSync('token');
-				uni.removeStorageSync('chatToken');
-				uni.removeStorageSync('vuex_state');
-				uni.removeStorageSync('serveChatToken');
-				uni.removeStorageSync('serveChatId');
+				uni.clearStorageSync();
 				this.$store.dispatch('app/changeOrganization', {});
 				this.$store.dispatch('app/changeUser', {});
 				uni.removeTabBarBadge({

virgo.wzfrontend/workark_wx/subPages/myPage/myDetail/myDetail.vue

@@ -93,8 +93,8 @@
 				let userInfo = await getUserInfoById(this.user.userId);
 				if (userInfo.state) {
 					this.user['userName'] = userInfo.data.name;
-					this.user['userId'] = userInfo.data.id;
-					this.user['portrait'] = userInfo.data.portrait;
+					this.user['userId'] = userInfo.data.id;
+					this.user['portrait'] = userInfo.data.portrait;
 					this.user['sex'] = userInfo.data.sex;
 					this.$store.dispatch('app/changeUser', this.user);
 				}
@@ -106,11 +106,7 @@
 					success: res => {
 						if (res.confirm) {
 							this.$chat.disConnect();
-							uni.removeStorageSync('token');
-							uni.removeStorageSync('chatToken');
-							uni.removeStorageSync('vuex_state');
-							uni.removeStorageSync('serveChatToken');
-							uni.removeStorageSync('serveChatId');
+							uni.clearStorageSync();
 							this.$store.dispatch('app/changeOrganization', {});
 							this.$store.dispatch('app/changeUser', {});
 							uni.removeTabBarBadge({

virgo.wzfrontend/workark_wx/subPages/shopPage/payment/payment.vue

@@ -1,34 +1,51 @@
 <template>
-	<view class="wrap">
-		<uv-cell-group :customStyle="{
-			background:'#fff'
-		}">
-			<uv-cell icon="bag" title="订单编号" :arrow="false" :value="orderSn" size="large"></uv-cell>
-			<uv-cell icon="red-packet" title="应付金额" :arrow="false" :value="totalPriceFmt" size="large"></uv-cell>
-		</uv-cell-group>
-		<uv-radio-group v-model="payType" :customStyle="{
-			background:'#fff'
-		}">
-			<view class="item" v-for="(res, index) in payWayList" :key="res.name">
-				<uv-row>
-					<uv-col :span="11">
-						<view class="top">
-							<view class="name">
-								<uv-icon name="weixin-fill" size="60" color="#6cac3e"></uv-icon>
-							</view>
-							<view class="label">
-								微信支付
-							</view>
-						</view>
-					</uv-col>
-					<uv-col :span="1">
-						<uv-radio :name="res.name" iconSize="32" size="36"></uv-radio>
-					</uv-col>
-				</uv-row>
+	<view>
+		<view v-if="orderSuccess">
+			<kevy-result-page v-if="isOrderSuccess" type="success" title="支付成功" primarColor="#4fc08d" :details="[{
+					label: '订单编号',
+					value: orderSn
+				}, {
+					label: '支付金额',
+					value: totalPriceFmt
+				}, {
+					label: '支付状态',
+					value:'支付成功'
+				}]" primaryBtnText="查看订单" secondaryBtnText="返回" @primaryBtnClick="primaryBtnClick"
+				@secondaryBtnClick="secondaryBtnClick">
+			</kevy-result-page>
+			<view class="wrap" v-else>
+				<uv-cell-group :customStyle="{
+					background:'#fff'
+				}">
+					<uv-cell icon="bag" title="订单编号" :arrow="false" :value="orderSn" size="large"></uv-cell>
+					<uv-cell icon="red-packet" title="应付金额" :arrow="false" :value="totalPriceFmt"
+						size="large"></uv-cell>
+				</uv-cell-group>
+				<uv-radio-group v-model="payType" :customStyle="{
+					background:'#fff'
+				}">
+					<view class="item" v-for="(res, index) in payWayList" :key="res.name">
+						<uv-row>
+							<uv-col :span="11">
+								<view class="top">
+									<view class="name">
+										<uv-icon name="weixin-fill" size="60" color="#6cac3e"></uv-icon>
+									</view>
+									<view class="label">
+										微信支付
+									</view>
+								</view>
+							</uv-col>
+							<uv-col :span="1">
+								<uv-radio :name="res.name" iconSize="32" size="36"></uv-radio>
+							</uv-col>
+						</uv-row>
+					</view>
+				</uv-radio-group>
+				<view class="button">
+					<uv-button type="primary" @click="submit">立即支付</uv-button>
+				</view>
 			</view>
-		</uv-radio-group>
-		<view class="button">
-			<uv-button type="primary" @click="submit">立即支付</uv-button>
 		</view>
 	</view>
 </template>
@@ -47,7 +64,9 @@
 				payWayList: [{
 					name: 'wxpay',
 					text: '微信支付'
-				}]
+				}],
+				isOrderSuccess: false,
+				orderSuccess: false
 			}
 		},
 		computed: {
@@ -64,9 +83,19 @@
 			init() {
 				getOrderResult(this.orderSn).then(res => {
 					//如果当前订单已经支付成功跳转到订单详情页
-					if (res.data) {}
+					if (res.state) {
+						this.orderSuccess = true;
+						this.isOrderSuccess = res.data;
+					}
 				})
 			},
+			primaryBtnClick() {
+				this.$navigateTo('/subPages/shopPage/webview/webview?url=' + encodeURIComponent('/order/detail/' + this
+					.orderSn));
+			},
+			secondaryBtnClick() {
+				uni.navigateBack();
+			},
 			submit() {
 				if ('wxpay' === this.payType) {
 					getPaymentInformation(this.orderSn).then(response => {
@@ -80,17 +109,7 @@
 								signType: res.signType,
 								paySign: res.paySign, //签名内容
 								success: (e) => {
-									getOrderResult(this.orderSn).then(res => {
-										//如果当前订单已经支付成功跳转到订单详情页
-										if (res.data) {
-											this.$u.route({
-												url: '/pages/order/detail',
-												params: {
-													orderSn: orderSn
-												}
-											})
-										}
-									})
+									this.init();
 								},
 								fail: (e) => {
 									this.$toast('取消支付');

virgo.wzfrontend/workark_wx/subPages/workarkPage/components/sureOrder.vue

@@ -122,11 +122,7 @@
 			},
 			logout() {
 				this.$chat.disConnect();
-				uni.removeStorageSync('token');
-				uni.removeStorageSync('chatToken');
-				uni.removeStorageSync('vuex_state');
-				uni.removeStorageSync('serveChatToken');
-				uni.removeStorageSync('serveChatId');
+				uni.clearStorageSync();
 				this.$store.dispatch('app/changeOrganization', {});
 				this.$store.dispatch('app/changeUser', {});
 				uni.removeTabBarBadge({
@@ -136,7 +132,7 @@
 			async payment() {
 				if (!uni.getStorageSync('openId')) {
 					this.$toast('未获取到OpenId，请重新登录');
-					this.logout();
+					this.logout();
 					this.$emit('closePopup');
 					setTimeout(() => {
 						uni.navigateTo({

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -130,13 +130,13 @@ var components
 try {
   components = {
     uvEmpty: function () {
-      return Promise.all(/*! import() | uni_modules/uv-empty/components/uv-empty/uv-empty */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-empty/components/uv-empty/uv-empty")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-empty/components/uv-empty/uv-empty.vue */ 305))
+      return Promise.all(/*! import() | uni_modules/uv-empty/components/uv-empty/uv-empty */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-empty/components/uv-empty/uv-empty")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-empty/components/uv-empty/uv-empty.vue */ 298))
     },
     uvButton: function () {
-      return Promise.all(/*! import() | uni_modules/uv-button/components/uv-button/uv-button */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-button/components/uv-button/uv-button")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-button/components/uv-button/uv-button.vue */ 313))
+      return Promise.all(/*! import() | uni_modules/uv-button/components/uv-button/uv-button */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-button/components/uv-button/uv-button")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-button/components/uv-button/uv-button.vue */ 306))
     },
     uvIcon: function () {
-      return Promise.all(/*! import() | uni_modules/uv-icon/components/uv-icon/uv-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-icon/components/uv-icon/uv-icon")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-icon/components/uv-icon/uv-icon.vue */ 321))
+      return Promise.all(/*! import() | uni_modules/uv-icon/components/uv-icon/uv-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-icon/components/uv-icon/uv-icon")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-icon/components/uv-icon/uv-icon.vue */ 314))
     },
   }
 } catch (e) {

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/pages/login/login.js

@@ -101,22 +101,22 @@ var components
 try {
   components = {
     uvIcon: function () {
-      return Promise.all(/*! import() | uni_modules/uv-icon/components/uv-icon/uv-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-icon/components/uv-icon/uv-icon")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-icon/components/uv-icon/uv-icon.vue */ 321))
+      return Promise.all(/*! import() | uni_modules/uv-icon/components/uv-icon/uv-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-icon/components/uv-icon/uv-icon")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-icon/components/uv-icon/uv-icon.vue */ 314))
     },
     uvButton: function () {
-      return Promise.all(/*! import() | uni_modules/uv-button/components/uv-button/uv-button */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-button/components/uv-button/uv-button")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-button/components/uv-button/uv-button.vue */ 313))
+      return Promise.all(/*! import() | uni_modules/uv-button/components/uv-button/uv-button */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-button/components/uv-button/uv-button")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-button/components/uv-button/uv-button.vue */ 306))
     },
     uvCode: function () {
-      return Promise.all(/*! import() | uni_modules/uv-code/components/uv-code/uv-code */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-code/components/uv-code/uv-code")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-code/components/uv-code/uv-code.vue */ 338))
+      return Promise.all(/*! import() | uni_modules/uv-code/components/uv-code/uv-code */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-code/components/uv-code/uv-code")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-code/components/uv-code/uv-code.vue */ 331))
     },
     uvCheckboxGroup: function () {
-      return Promise.all(/*! import() | uni_modules/uv-checkbox/components/uv-checkbox-group/uv-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-checkbox/components/uv-checkbox-group/uv-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-checkbox/components/uv-checkbox-group/uv-checkbox-group.vue */ 344))
+      return Promise.all(/*! import() | uni_modules/uv-checkbox/components/uv-checkbox-group/uv-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-checkbox/components/uv-checkbox-group/uv-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-checkbox/components/uv-checkbox-group/uv-checkbox-group.vue */ 337))
     },
     uvCheckbox: function () {
-      return Promise.all(/*! import() | uni_modules/uv-checkbox/components/uv-checkbox/uv-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-checkbox/components/uv-checkbox/uv-checkbox")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-checkbox/components/uv-checkbox/uv-checkbox.vue */ 352))
+      return Promise.all(/*! import() | uni_modules/uv-checkbox/components/uv-checkbox/uv-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-checkbox/components/uv-checkbox/uv-checkbox")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-checkbox/components/uv-checkbox/uv-checkbox.vue */ 345))
     },
     uvText: function () {
-      return Promise.all(/*! import() | uni_modules/uv-text/components/uv-text/uv-text */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-text/components/uv-text/uv-text")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-text/components/uv-text/uv-text.vue */ 294))
+      return Promise.all(/*! import() | uni_modules/uv-text/components/uv-text/uv-text */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-text/components/uv-text/uv-text")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-text/components/uv-text/uv-text.vue */ 287))
     },
   }
 } catch (e) {
@@ -206,6 +206,7 @@ exports.default = void 0;
 var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 63));
 var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 65));
 var _login2 = __webpack_require__(/*! @/request/api/login */ 130);
+var _shop = __webpack_require__(/*! @/request/api/shop */ 192);
 var _validate = __webpack_require__(/*! @/uitls/validate */ 131);
 //
 //
@@ -281,7 +282,7 @@ var _validate = __webpack_require__(/*! @/uitls/validate */ 131);
 //
 var imageCode = function imageCode() {
   __webpack_require__.e(/*! require.ensure | components/login/imageCode */ "components/login/imageCode").then((function () {
-    return resolve(__webpack_require__(/*! @/components/login/imageCode.vue */ 360));
+    return resolve(__webpack_require__(/*! @/components/login/imageCode.vue */ 353));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {
@@ -461,7 +462,10 @@ var _default = {
                 return (0, _login2.getOpenId)(wxCode);
               case 11:
                 wxData = _context4.sent;
-                if (wxData.state) uni.setStorageSync('openId', wxData.data.openid);
+                if (wxData.state) {
+                  uni.setStorageSync('openId', wxData.data.openid);
+                  (0, _shop.updateWxOpenId)(wxData.data.openid);
+                }
               case 13:
                 _context4.next = 15;
                 return (0, _login2.getUserInfo)();

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/pages/message/message.js

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     uvEmpty: function () {
-      return Promise.all(/*! import() | uni_modules/uv-empty/components/uv-empty/uv-empty */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-empty/components/uv-empty/uv-empty")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-empty/components/uv-empty/uv-empty.vue */ 305))
+      return Promise.all(/*! import() | uni_modules/uv-empty/components/uv-empty/uv-empty */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-empty/components/uv-empty/uv-empty")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-empty/components/uv-empty/uv-empty.vue */ 298))
     },
     uvButton: function () {
-      return Promise.all(/*! import() | uni_modules/uv-button/components/uv-button/uv-button */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-button/components/uv-button/uv-button")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-button/components/uv-button/uv-button.vue */ 313))
+      return Promise.all(/*! import() | uni_modules/uv-button/components/uv-button/uv-button */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-button/components/uv-button/uv-button")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-button/components/uv-button/uv-button.vue */ 306))
     },
     uvBadge: function () {
-      return Promise.all(/*! import() | uni_modules/uv-badge/components/uv-badge/uv-badge */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-badge/components/uv-badge/uv-badge")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-badge/components/uv-badge/uv-badge.vue */ 330))
+      return Promise.all(/*! import() | uni_modules/uv-badge/components/uv-badge/uv-badge */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-badge/components/uv-badge/uv-badge")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-badge/components/uv-badge/uv-badge.vue */ 323))
     },
   }
 } catch (e) {

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/pages/my/my.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     uvIcon: function () {
-      return Promise.all(/*! import() | uni_modules/uv-icon/components/uv-icon/uv-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-icon/components/uv-icon/uv-icon")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-icon/components/uv-icon/uv-icon.vue */ 321))
+      return Promise.all(/*! import() | uni_modules/uv-icon/components/uv-icon/uv-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-icon/components/uv-icon/uv-icon")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-icon/components/uv-icon/uv-icon.vue */ 314))
     },
     uvBadge: function () {
-      return Promise.all(/*! import() | uni_modules/uv-badge/components/uv-badge/uv-badge */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-badge/components/uv-badge/uv-badge")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-badge/components/uv-badge/uv-badge.vue */ 330))
+      return Promise.all(/*! import() | uni_modules/uv-badge/components/uv-badge/uv-badge */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-badge/components/uv-badge/uv-badge")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-badge/components/uv-badge/uv-badge.vue */ 323))
     },
   }
 } catch (e) {

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/pages/workark/workark.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     uvImage: function () {
-      return Promise.all(/*! import() | uni_modules/uv-image/components/uv-image/uv-image */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-image/components/uv-image/uv-image")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-image/components/uv-image/uv-image.vue */ 286))
+      return Promise.all(/*! import() | uni_modules/uv-image/components/uv-image/uv-image */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-image/components/uv-image/uv-image")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-image/components/uv-image/uv-image.vue */ 279))
     },
     uvText: function () {
-      return Promise.all(/*! import() | uni_modules/uv-text/components/uv-text/uv-text */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-text/components/uv-text/uv-text")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-text/components/uv-text/uv-text.vue */ 294))
+      return Promise.all(/*! import() | uni_modules/uv-text/components/uv-text/uv-text */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-text/components/uv-text/uv-text")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-text/components/uv-text/uv-text.vue */ 287))
     },
   }
 } catch (e) {

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/subPages/chatPage/chat/chat.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     uvSafeBottom: function () {
-      return Promise.all(/*! import() | uni_modules/uv-safe-bottom/components/uv-safe-bottom/uv-safe-bottom */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-safe-bottom/components/uv-safe-bottom/uv-safe-bottom")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-safe-bottom/components/uv-safe-bottom/uv-safe-bottom.vue */ 404))
+      return Promise.all(/*! import() | uni_modules/uv-safe-bottom/components/uv-safe-bottom/uv-safe-bottom */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-safe-bottom/components/uv-safe-bottom/uv-safe-bottom")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-safe-bottom/components/uv-safe-bottom/uv-safe-bottom.vue */ 397))
     },
     uvIcon: function () {
-      return Promise.all(/*! import() | uni_modules/uv-icon/components/uv-icon/uv-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-icon/components/uv-icon/uv-icon")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-icon/components/uv-icon/uv-icon.vue */ 321))
+      return Promise.all(/*! import() | uni_modules/uv-icon/components/uv-icon/uv-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-icon/components/uv-icon/uv-icon")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-icon/components/uv-icon/uv-icon.vue */ 314))
     },
   }
 } catch (e) {