fix

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

@@ -6,10 +6,12 @@
 <script>
 	import store from '@/store'
 	import userApi from '@/api/user'
+	import wechatApi from '@/api/wechat'
 	export default {
 		watch: {
 			$route(newValue, oldValue) {
 				let token = this.$route.query.token;
+				let code = this.$route.query.code;
 				if (token) {
 					store.dispatch('app/toggleToken', token);
 					userApi.getUserInfo().then(response => {

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

@@ -1,15 +1,50 @@
-import Vue from 'vue';
-import App from './App';
-import { router } from './router';
-import VueLazyload from 'vue-lazyload'
-Vue.use(VueLazyload, {
-  preLoad: 1.3,
-  error: 'svg/loading.svg',
-  loading: 'svg/loading.svg',
-  attempt: 1
-})
-new Vue({
-  router,
-  el: '#app',
-  render: h => h(App)
-});
+import Vue from 'vue';
+import App from './App';
+import {
+	router
+} from './router';
+import VueLazyload from 'vue-lazyload'
+Vue.use(VueLazyload, {
+	preLoad: 1.3,
+	error: 'svg/loading.svg',
+	loading: 'svg/loading.svg',
+	attempt: 1
+})
+const ua = navigator.userAgent.toLowerCase();
+const wxEnv = (successCallback, failBack) => {
+	if (ua.match(/MicroMessenger/i) == "micromessenger") {
+		wx.miniProgram.getEnv((res) => {
+			if (res.miniprogram) {
+				successCallback();
+			} else {
+				alert("不在小程序里");
+			}
+		})
+	} else {
+		failBack();
+	}
+}
+Vue.prototype.$wxEnv = wxEnv;
+Vue.prototype.$linkTo = (path) => {
+	wxEnv(() => {
+		wx.miniProgram.navigateTo({
+			url: '/subPages/shopPage/webview/webview?url=' + encodeURIComponent(path)
+		})
+	}, () => {
+		router.push({
+			path: path
+		})
+	});
+}
+Vue.prototype.$linkBack = () => {
+	wxEnv(() => {
+		wx.miniProgram.navigateBack();
+	}, () => {
+		$router.go(-1);
+	});
+}
+new Vue({
+	router,
+	el: '#app',
+	render: h => h(App)
+});

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

@@ -50,7 +50,7 @@ service.interceptors.response.use(
 			store.dispatch('app/toggleToken', response.headers.token)
 		}
 		const res = response.data
-		if (res.code !== 20000) {
+		if (res.code !== 200) {
 			return Promise.reject(res.msg || 'error')
 		} else {
 			return res

virgo.wzfrontend/shop/shop-mobile/src/view/address/address.js

@@ -1,50 +1,58 @@
-import address from '@/api/address'
-import {AddressList, Col, Icon, NavBar, Row, Toast} from 'vant'
-import storage  from '@/utils/storage'
-export default {
-    components: {
-        [AddressList.name]: AddressList,
-        [Toast.name]: Toast,
-        [Row.name]: Row,
-        [Col.name]: Col,
-        [Icon.name]: Icon,
-        [NavBar.name]: NavBar
-    },
-    data() {
-        return {
-            activeFooter: 3,
-            chosenAddressId: 0,
-            list: [
-            ]
-        }
-    },
-    mounted(){
-        this.init()
-    },
-    methods: {
-        init(){
-            address.queryByUser().then( response => {
-                this.list = response.data
-                for(const index in this.list){
-                    if(this.list[index].isDefault === true){
-                        this.chosenAddressId= this.list[index].id
-                    }
-                }
-            }).catch( err => {
-                Toast(err.response.data.message)
-            })
-        },
-        onAdd() {
-            Toast('新增地址');
-            this.$router.push('address/edit')
-        },
-
-        onEdit(item, index) {
-            this.$router.push({path:'address/edit',query:{id:item.id}})
-        },
-        onClickLeft() {
-            storage.set('chosenAddressId',this.chosenAddressId)
-            this.$router.go(-1)
-        }
-    }
-}
+import address from '@/api/address'
+import {
+	AddressList,
+	Col,
+	Icon,
+	NavBar,
+	Row,
+	Toast
+} from 'vant'
+import storage from '@/utils/storage'
+export default {
+	components: {
+		[AddressList.name]: AddressList,
+		[Toast.name]: Toast,
+		[Row.name]: Row,
+		[Col.name]: Col,
+		[Icon.name]: Icon,
+		[NavBar.name]: NavBar
+	},
+	data() {
+		return {
+			activeFooter: 3,
+			chosenAddressId: 0,
+			list: []
+		}
+	},
+	mounted() {
+		this.init()
+	},
+	methods: {
+		init() {
+			address.queryByUser().then(response => {
+				this.list = response.data.map(node => {
+					node['address'] = node.wholeAddressInfo + node.addressDetail;
+					return node;
+				})
+				for (const index in this.list) {
+					if (this.list[index].isDefault === true) {
+						this.chosenAddressId = this.list[index].id
+					}
+				}
+			}).catch(err => {
+				Toast(err.response.data.message)
+			})
+		},
+		onAdd() {
+			Toast('新增地址');
+			this.$linkTo('/address/edit')
+		},
+		onEdit(item, index) {
+			this.$linkTo('/address/edit?id=' + item.id);
+		},
+		onClickLeft() {
+			storage.set('chosenAddressId', this.chosenAddressId)
+			this.$router.go(-1)
+		}
+	}
+}

virgo.wzfrontend/shop/shop-mobile/src/view/address/edit/edit.js

@@ -1,93 +1,99 @@
-import areaData from './area.js'
-import address from '@/api/address'
-import {AddressEdit , NavBar, Toast} from 'vant'
-
-export default {
-    components: {
-        [AddressEdit .name]: AddressEdit ,
-        [Toast.name]: Toast,
-        [NavBar.name]: NavBar
-    },
-    data() {
-        return {
-            showDelete:false,
-            areaList:areaData,
-            columnsPlaceholder: ['请选择', '请选择', '请选择'],
-            searchResult: [],
-            addressInfo:{}
-        }
-    },
-    created(){
-        this.init()
-    },
-    methods: {
-        init() {
-            const id = this.$route.query.id
-            if(id){
-                this.showDelete = true
-                address.get(id).then( response => {
-                    this.addressInfo = response.data
-                }).catch( (err) => {
-                    Toast.fail(err)
-                })
-            }
-        },
-        onSave(info){
-
-            let addressEntity = {
-                province:info.province,
-                city:info.city,
-                district:info.county,
-                addressDetail:info.addressDetail,
-                areaCode:info.areaCode,
-                tel:info.tel,
-                name:info.name,
-                postCode:info.postalCode,
-                isDefault : info.isDefault
-            }
-            if(info.id){
-                addressEntity.id = info.id
-            }
-            address.save(addressEntity).then( response => {
-                Toast('保存成功')
-                this.$router.go(-1)
-            }).catch( (err) => {
-                Toast.fail(err)
-            })
-        },
-
-        onChangeDetail(val) {
-            if (val) {
-                //todo 这里可以根据gps定位和关键字模糊搜索详细地址列表
-                this.searchResult = []
-                // this.searchResult = [{
-                //     name: '黄龙万科中心',
-                //     address: '杭州市西湖区'
-                // }];
-            } else {
-                this.searchResult = []
-            }
-        },
-        onClickLeft() {
-            this.$router.go(-1)
-        },
-        changeDefault(isDefault){
-             if(this.addressInfo.id) {
-                 address.changeDefault(this.addressInfo.id, isDefault).then(response => {
-                     Toast('修改成功')
-                 }).catch((err) => {
-                     Toast.fail(err)
-                 })
-             }
-
-        },
-        onDelete() {
-            address.remove(this.addressInfo.id).then( response => {
-                Toast('删除成功')
-                this.$router.push({path:'address'})
-            }).catch( (err) => {
-                Toast.fail(err)
-            })
-        }
-    }
-}
+import areaData from './area.js'
+import address from '@/api/address'
+import {
+	AddressEdit,
+	Toast
+} from 'vant'
+
+export default {
+	components: {
+		[AddressEdit.name]: AddressEdit,
+		[Toast.name]: Toast
+	},
+	data() {
+		return {
+			showDelete: false,
+			areaList: areaData,
+			columnsPlaceholder: ['请选择', '请选择', '请选择'],
+			searchResult: [],
+			addressInfo: {}
+		}
+	},
+	created() {
+		this.init()
+	},
+	methods: {
+		init() {
+			const id = this.$route.query.id
+			if (id) {
+				this.showDelete = true
+				address.get(id).then(response => {
+					this.addressInfo = response.data
+				}).catch((err) => {
+					Toast.fail(err)
+				})
+			}
+		},
+		onSave(info) {
+			let addressEntity = {
+				province: info.province,
+				city: info.city,
+				district: info.county,
+				addressDetail: info.addressDetail,
+				areaCode: info.areaCode,
+				tel: info.tel,
+				name: info.name,
+				postCode: info.postalCode,
+				isDefault: info.isDefault
+			}
+			if (info.id) {
+				addressEntity.id = info.id
+			}
+			address.save(addressEntity).then(response => {
+				Toast('保存成功');
+				this.$wxEnv(() => {
+					wx.miniProgram.postMessage({
+						data: 'foo'
+					})
+					this.$linkBack();
+				})
+
+			}).catch((err) => {
+				Toast.fail(err)
+			})
+		},
+
+		onChangeDetail(val) {
+			if (val) {
+				//todo 这里可以根据gps定位和关键字模糊搜索详细地址列表
+				this.searchResult = []
+				// this.searchResult = [{
+				//     name: '黄龙万科中心',
+				//     address: '杭州市西湖区'
+				// }];
+			} else {
+				this.searchResult = []
+			}
+		},
+		changeDefault(isDefault) {
+			if (this.addressInfo.id) {
+				address.changeDefault(this.addressInfo.id, isDefault).then(response => {
+					Toast('修改成功')
+				}).catch((err) => {
+					Toast.fail(err)
+				})
+			}
+
+		},
+		onDelete() {
+			address.remove(this.addressInfo.id).then(response => {
+				Toast('删除成功')
+				this.$router.push({
+					path: 'address'
+				})
+			}).catch((err) => {
+				Toast.fail(err)
+			})
+		}
+	}
+}

virgo.wzfrontend/shop/shop-mobile/src/view/address/edit/index.vue

@@ -1,27 +1,10 @@
-<template>
-    <div>
-        <van-nav-bar
-                title="编辑收货地址"
-                left-text="返回"
-                left-arrow
-                @click-left="onClickLeft"
-        />
-        <van-address-edit
-                :area-list="areaList"
-
-                :show-delete="showDelete"
-                :address-info="addressInfo"
-                show-set-default
-                show-search-result
-                :search-result="searchResult"
-                :area-columns-placeholder="columnsPlaceholder"
-                @save="onSave"
-                @delete="onDelete"
-                @change-default="changeDefault"
-                @change-detail="onChangeDetail"
-        />
-
-    </div>
-</template>
-
-<script src="./edit.js"></script>
+<template>
+	<div>
+		<van-address-edit :area-list="areaList" :show-delete="showDelete" :address-info="addressInfo" show-set-default
+			show-search-result :search-result="searchResult" :area-columns-placeholder="columnsPlaceholder"
+			@save="onSave" @delete="onDelete" @change-default="changeDefault" @change-detail="onChangeDetail" />
+
+	</div>
+</template>
+
+<script src="./edit.js"></script>

virgo.wzfrontend/shop/shop-mobile/src/view/address/index.vue

@@ -1,44 +1,33 @@
-<template>
-    <div>
-        <van-nav-bar
-                title="收货地址"
-                left-arrow
-                @click-left="onClickLeft"
-        />
-        <van-address-list
-                v-model="chosenAddressId"
-                :list="list"
-                disabled-text=""
-                @add="onAdd"
-                @edit="onEdit"
-        />
-    </div>
-</template>
-
-<script src="./address.js"></script>
-
-<style lang="less">
-    .user {
-        &-poster {
-            width: 100%;
-            height: 53vw;
-            display: block;
-        }
-
-        &-group {
-            margin-bottom: 15px;
-        }
-
-        &-links {
-            padding: 15px 0;
-            font-size: 12px;
-            text-align: center;
-            background-color: #fff;
-
-            .van-icon {
-                display: block;
-                font-size: 24px;
-            }
-        }
-    }
-</style>
+<template>
+	<div>
+		<van-address-list v-model="chosenAddressId" :list="list" disabled-text="" @add="onAdd" @edit="onEdit" />
+	</div>
+</template>
+
+<script src="./address.js"></script>
+
+<style lang="less">
+	.user {
+		&-poster {
+			width: 100%;
+			height: 53vw;
+			display: block;
+		}
+
+		&-group {
+			margin-bottom: 15px;
+		}
+
+		&-links {
+			padding: 15px 0;
+			font-size: 12px;
+			text-align: center;
+			background-color: #fff;
+
+			.van-icon {
+				display: block;
+				font-size: 24px;
+			}
+		}
+	}
+</style>

virgo.wzfrontend/shop/shop-mobile/src/view/cart/cart.js

@@ -1,109 +1,127 @@
-import cartApi from '@/api/cart'
-import { Checkbox, CheckboxGroup, Card, SubmitBar, Toast, NavBar, Tabbar, TabbarItem,Stepper, Button, Icon  } from 'vant';
-const baseApi = process.env.VUE_APP_BASE_API
-import storage from '@/utils/storage'
-export default {
-    components: {
-        [Card.name]: Card,
-        [Checkbox.name]: Checkbox,
-        [SubmitBar.name]: SubmitBar,
-        [CheckboxGroup.name]: CheckboxGroup,
-        [NavBar.name]: NavBar,
-        [Tabbar.name]: Tabbar,
-        [TabbarItem.name]: TabbarItem,
-        [Stepper.name]: Stepper,
-        [Button.name]: Button,
-        [Icon.name]: Icon
-    },
-
-    data() {
-        return {
-            isLogin:false,
-            activeFooter: 2,
-            checkedCartItem: [],//当前选中的购物车项目id
-            allCartItem:[], // 用户所有的购物车项目id列表
-            cartList: [],
-            checkedAll: true,
-            showEdit: false,
-            rightText:'编辑'
-        }
-    },
-    mounted(){
-      this.init()
-    },
-    computed: {
-        submitBarText() {
-            const count = this.checkedCartItem.length;
-            return '结算' + (count ? `(${count})` : '');
-        },
-        totalPrice() {
-                return this.cartList.reduce((total, item) => total + (this.checkedCartItem.indexOf(item.id) !== -1 ? (parseFloat(item.price)*item.count) : 0), 0)
-        }
-    },
-
-    methods: {
-        init(){
-            const user = storage.getUser()
-            this.isLogin = user.nickName
-            if(this.isLogin) {
-                cartApi.queryByUser().then(response => {
-                    let cartList = response.data
-                    for (const index in cartList) {
-                        let cart = cartList[index]
-                        cart.thumb = baseApi + '/file/getImgStream?idFile=' + cart.goods.pic
-                        this.checkedCartItem.push(cartList[index].id )
-                    }
-
-                    this.allCartItem = this.checkedCartItem
-                    this.cartList = cartList
-                }).catch((err) => {
-                    console.log(err)
-                })
-            }
-        },
-        submit() {
-            this.$router.push({path:'checkout',query: {ids: this.checkedCartItem }})
-        },
-        formatPrice(price) {
-            return (price / 100).toFixed(2);
-        },
-        stepperEvent(item, arg) {
-            const count = arg[0];
-            cartApi.update(item.id,count)
-        },
-        toHome() {
-            this.$router.push('/')
-        },
-        toLogin() {
-            this.$router.push({path:'login', query: {redirect:'cart'}})
-        },
-        checkAll( ) {
-            if(this.checkedAll === true){
-                this.checkedCartItem = this.allCartItem
-            }else{
-                this.checkedCartItem = []
-            }
-            return
-            if (this.checkedCartItem.length === this.cartList.length) {
-                this.allCartItem = this.checkedCartItem
-                this.checkedCartItem = []
-            } else {
-                this.checkedCartItem = this.allCartItem
-            }
-        },
-        onClickRight(){
-            if(this.showEdit === true){
-                this.showEdit = false
-                this.rightText = '编辑'
-            }else {
-                this.showEdit = true
-                this.rightText = '完成'
-            }
-        },
-        remove(){
-            cartApi.remove(this.checkedCartItem).then(response =>{
-                this.init()
-            })
-        }
-    }
-};
+import cartApi from '@/api/cart'
+import {
+	Checkbox,
+	CheckboxGroup,
+	Card,
+	SubmitBar,
+	Toast,
+	NavBar,
+	Tabbar,
+	TabbarItem,
+	Stepper,
+	Button,
+	Icon
+} from 'vant';
+const baseApi = process.env.VUE_APP_BASE_API
+import storage from '@/utils/storage'
+export default {
+	components: {
+		[Card.name]: Card,
+		[Checkbox.name]: Checkbox,
+		[SubmitBar.name]: SubmitBar,
+		[CheckboxGroup.name]: CheckboxGroup,
+		[NavBar.name]: NavBar,
+		[Tabbar.name]: Tabbar,
+		[TabbarItem.name]: TabbarItem,
+		[Stepper.name]: Stepper,
+		[Button.name]: Button,
+		[Icon.name]: Icon
+	},
+
+	data() {
+		return {
+			isLogin: false,
+			activeFooter: 2,
+			checkedCartItem: [], //当前选中的购物车项目id
+			allCartItem: [], // 用户所有的购物车项目id列表
+			cartList: [],
+			checkedAll: true,
+			showEdit: false,
+			rightText: '编辑'
+		}
+	},
+	mounted() {
+		this.init()
+	},
+	computed: {
+		submitBarText() {
+			const count = this.checkedCartItem.length;
+			return '结算' + (count ? `(${count})` : '');
+		},
+		totalPrice() {
+			return this.cartList.reduce((total, item) => total + (this.checkedCartItem.indexOf(item.id) !== -1 ? (
+				parseFloat(item.price) * item.count) : 0), 0)
+		}
+	},
+
+	methods: {
+		init() {
+			const user = storage.getUser()
+			this.isLogin = user.nickName
+			if (this.isLogin) {
+				cartApi.queryByUser().then(response => {
+					let cartList = response.data
+					for (const index in cartList) {
+						let cart = cartList[index]
+						cart.thumb = baseApi + '/file/getImgStream?idFile=' + cart.goods.pic
+						this.checkedCartItem.push(cartList[index].id)
+					}
+
+					this.allCartItem = this.checkedCartItem
+					this.cartList = cartList
+				}).catch((err) => {
+					console.log(err)
+				})
+			}
+		},
+		submit() {
+			this.$linkTo('/checkout?ids=' + this.checkedCartItem);
+		},
+		formatPrice(price) {
+			return (price / 100).toFixed(2);
+		},
+		stepperEvent(item, arg) {
+			const count = arg[0];
+			cartApi.update(item.id, count)
+		},
+		toHome() {
+			this.$router.push('/')
+		},
+		toLogin() {
+			this.$router.push({
+				path: 'login',
+				query: {
+					redirect: 'cart'
+				}
+			})
+		},
+		checkAll() {
+			if (this.checkedAll === true) {
+				this.checkedCartItem = this.allCartItem
+			} else {
+				this.checkedCartItem = []
+			}
+			return
+			if (this.checkedCartItem.length === this.cartList.length) {
+				this.allCartItem = this.checkedCartItem
+				this.checkedCartItem = []
+			} else {
+				this.checkedCartItem = this.allCartItem
+			}
+		},
+		onClickRight() {
+			if (this.showEdit === true) {
+				this.showEdit = false
+				this.rightText = '编辑'
+			} else {
+				this.showEdit = true
+				this.rightText = '完成'
+			}
+		},
+		remove() {
+			cartApi.remove(this.checkedCartItem).then(response => {
+				this.init()
+			})
+		}
+	}
+};

virgo.wzfrontend/shop/shop-mobile/src/view/cart/index.vue

@@ -1,111 +1,80 @@
-<template>
-  <div class="cart">
-    <van-nav-bar
-            title="购物车"
-            :right-text="rightText"
-            @click-right="onClickRight"
-    />
-    <van-checkbox-group class="card-goods" v-model="checkedCartItem" v-if="isLogin && cartList.length>0">
-      <div   v-for="item in cartList"
-             :key="item.id"    class="card-goods__item">
-      <van-checkbox
-        :name="item.id"
-      ></van-checkbox>
-        <van-card
-                style="margin-left:15px;"
-          :title="item.title"
-          :desc="item.goods.descript"
-
-          :price="formatPrice(item.price)"
-          :thumb="item.thumb"
-        >
-
-          <div slot="footer">
-            <van-stepper v-model="item.count" @change="stepperEvent(item,arguments)" disableInput/>
-          </div>
-        </van-card>
-      </div>
-      <br><br><br><br><br>
-
-    </van-checkbox-group>
-    <van-submit-bar
-            v-show="!showEdit"
-      :price="totalPrice"
-      :disabled="!checkedCartItem.length"
-      :button-text="submitBarText"
-      @submit="submit"
-      v-if="isLogin && cartList.length>0"
-    >
-      <van-checkbox v-model="checkedAll" @click="checkAll" style="padding: 0 10px;">全选</van-checkbox>
-    </van-submit-bar>
-      <van-submit-bar
-              v-show="showEdit"
-              :price="totalPrice"
-              :disabled="!checkedCartItem.length"
-              button-text="删除"
-              @submit="remove"
-              v-if="isLogin && cartList.length>0"
-      >
-      <van-checkbox v-model="checkedAll" @click="checkAll" style="padding: 0 10px;">全选</van-checkbox>
-    </van-submit-bar>
-    <div class="no-data" v-if="isLogin && cartList.length ===0 ">
-      <p style="text-align: center;color:lightgray">
-        <van-icon name="cart-o" style="text-align: center" size="3rem"/><br>
-        购物车还是空的</p>
-      <van-button type="default" block round @click="toHome">去逛逛</van-button>
-    </div>
-    <div class="no-data" v-if="!isLogin" >
-      <p style="text-align: center;color:lightgray">
-        <van-icon name="cart-o" style="text-align: center" size="3rem"/><br>
-        还没有登录</p>
-      <van-button type="primary" block round @click="toLogin">立即登录</van-button>
-    </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="./cart.js"></script>
-
-<style lang="less">
-  .cart{
-    .no-data{
-      margin-top:60%;
-    }
-  }
-  .van-submit-bar{
-   bottom:48px;
-  }
-.card-goods {
-  background-color: #fff;
-
-  &__item {
-    position: relative;
-    background-color: #fafafa;
-
-    .van-checkbox__label {
-      width: 100%;
-      height: auto; // temp
-      padding: 0 10px 0 15px;
-      box-sizing: border-box;
-    }
-
-    .van-checkbox__icon {
-      top: 50%;
-      left: 10px;
-      z-index: 1;
-      position: absolute;
-      margin-top: -10px;
-    }
-
-    .van-card__price {
-      color: #f44;
-    }
-  }
-}
-</style>
+<template>
+	<div class="cart">
+		<van-nav-bar title="购物车" :right-text="rightText" @click-right="onClickRight" />
+		<van-checkbox-group class="card-goods" v-model="checkedCartItem" v-if="isLogin && cartList.length>0">
+			<div v-for="item in cartList" :key="item.id" class="card-goods__item">
+				<van-checkbox :name="item.id"></van-checkbox>
+				<van-card style="margin-left:15px;" :title="item.title" :desc="item.goods.descript"
+					:price="formatPrice(item.price)" :thumb="item.thumb">
+					<div slot="footer">
+						<van-stepper v-model="item.count" @change="stepperEvent(item,arguments)" disableInput />
+					</div>
+				</van-card>
+			</div>
+		</van-checkbox-group>
+		<van-submit-bar v-show="!showEdit" :price="totalPrice" :disabled="!checkedCartItem.length"
+			:button-text="submitBarText" @submit="submit" v-if="isLogin && cartList.length>0">
+			<van-checkbox v-model="checkedAll" @click="checkAll" style="padding: 0 10px;">全选</van-checkbox>
+		</van-submit-bar>
+		<van-submit-bar v-show="showEdit" :price="totalPrice" :disabled="!checkedCartItem.length" button-text="删除"
+			@submit="remove" v-if="isLogin && cartList.length>0">
+			<van-checkbox v-model="checkedAll" @click="checkAll" style="padding: 0 10px;">全选</van-checkbox>
+		</van-submit-bar>
+		<div class="no-data" v-if="isLogin && cartList.length ===0 ">
+			<p style="text-align: center;color:lightgray">
+				<van-icon name="cart-o" style="text-align: center" size="3rem" /><br>
+				购物车还是空的
+			</p>
+			<van-button type="default" block round @click="toHome">去逛逛</van-button>
+		</div>
+		<div class="no-data" v-if="!isLogin">
+			<p style="text-align: center;color:lightgray">
+				<van-icon name="cart-o" style="text-align: center" size="3rem" /><br>
+				还没有登录
+			</p>
+			<van-button type="primary" block round @click="toLogin">立即登录</van-button>
+		</div>
+	</div>
+</template>
+
+<script src="./cart.js"></script>
+
+<style lang="less">
+	.cart {
+		.no-data {
+			margin-top: 60%;
+		}
+	}
+
+	.van-submit-bar {
+		bottom: 0px;
+	}
+
+	.card-goods {
+		background-color: #fff;
+
+		&__item {
+			position: relative;
+			background-color: #fafafa;
+
+			.van-checkbox__label {
+				width: 100%;
+				height: auto; // temp
+				padding: 0 10px 0 15px;
+				box-sizing: border-box;
+			}
+
+			.van-checkbox__icon {
+				top: 50%;
+				left: 10px;
+				z-index: 1;
+				position: absolute;
+				margin-top: -10px;
+			}
+
+			.van-card__price {
+				color: #f44;
+			}
+		}
+	}
+</style>

virgo.wzfrontend/shop/shop-mobile/src/view/goods/goods.js

@@ -1,172 +1,176 @@
-import goods from '@/api/goods'
-import cart from '@/api/cart'
-import favorite from '@/api/favorite'
-import storage from '@/utils/storage'
-
-import {
-    Cell,
-    CellGroup,
-    Col,
-    GoodsAction,
-    GoodsActionButton,
-    GoodsActionIcon,
-    Icon,
-    Sku,
-    Swipe,
-    SwipeItem,
-    Tabbar,
-    TabbarItem,
-    Tag,
-    Toast,
-    Button
-} from 'vant';
-
-const baseApi = process.env.VUE_APP_BASE_API
-
-export default {
-    components: {
-        [Tag.name]: Tag,
-        [Col.name]: Col,
-        [Icon.name]: Icon,
-        [Cell.name]: Cell,
-        [CellGroup.name]: CellGroup,
-        [Swipe.name]: Swipe,
-        [SwipeItem.name]: SwipeItem,
-        [GoodsAction.name]: GoodsAction,
-        [GoodsActionIcon.name]: GoodsActionIcon,
-        [GoodsActionButton.name]: GoodsActionButton,
-        [Tabbar.name]: Tabbar,
-        [TabbarItem.name]: TabbarItem,
-        [Sku.name]: Sku,
-        [Button.name]:Button
-    },
-
-    data() {
-        return {
-            ifLike:false,
-            likeColor:'black',
-            cartCount:'',
-            showSku:false,
-            sku: {
-                tree: [
-                ],
-
-                list: [
-                ],
-                price: '0', // 默认价格（单位元）
-                stock_num: 20, // 商品总库存
-                collection_id: 0, // 无规格商品 skuId 取 collection_id，否则取所选 sku 组合对应的 id
-                none_sku: false, // 是否无规格商品
-                hide_stock: false // 是否隐藏剩余库存
-            },
-            offline:false,
-            goods: {
-                name: '',
-                price: 0,
-                express: '免运费',
-                remain: 0,
-                thumb: []
-            }
-        };
-    },
-    created() {
-        this.init()
-    },
-    computed: {
-
-    },
-    methods: {
-        init() {
-            let id = this.$route.params.id
-            goods.getGoods(id).then(response => {
-                let goods = response.data.goods
-                this.offline = !goods.isOnSale
-                let sku = response.data.sku
-                sku.price = (sku.price / 100).toFixed(2)
-                this.sku = sku
-                goods.thumb = new Array()
-                goods.picture = baseApi + '/file/getImgStream?idFile=' +goods.pic
-                const gallery = goods.gallery.split(',')
-                for (var index in gallery) {
-                    goods.thumb.push(baseApi + '/file/getImgStream?idFile=' + gallery[index])
-                }
-                this.goods = goods
-
-                const user = storage.getUser()
-                if(user.nickName) {
-                    //获取当前用户购物车商品数量
-                    cart.count().then(response => {
-                        this.cartCount = response.data ===0?'':response.data
-                    }).catch((err) => {
-
-                    })
-                    //判断当前用户是否收藏该产品
-                    favorite.ifLike(this.goods.id).then(response => {
-                        if (response.data === true) {
-                            this.likeColor = 'red'
-                            this.ifLike = true
-                        }
-                    }).catch((err) => {
-
-                    })
-                }
-            }).catch((err) => {
-                console.log('err',err)
-                Toast(err)
-            })
-
-        },
-        toHome() {
-            this.$router.push('/index')
-        },
-        formatPrice() {
-            return '¥' + (this.goods.price / 100).toFixed(2)
-        },
-
-        goToCart() {
-            this.$router.push('/cart');
-        },
-        addCart() {
-            this.showSku = true
-        },
-        buy() {
-            this.showSku = true
-        },
-        sorry() {
-            Toast('敬请期待')
-        },
-        like() {
-            if(this.ifLike === false) {
-                favorite.add(this.goods.id).then(response => {
-                    Toast('收藏成功')
-                    this.ifLike = true
-                    this.likeColor = 'red'
-                })
-            }else{
-                favorite.dislike(this.goods.id).then(response => {
-                    Toast('取消收藏成功')
-                    this.ifLike = false
-                    this.likeColor = 'black'
-                })
-
-            }
-        },
-        onBuyClicked(skuData) {
-            let cartData = {idGoods:skuData.goodsId,idSku:this.sku.none_sku?'':skuData.selectedSkuComb.id,count:skuData.selectedNum}
-            cart.add(cartData).then( response => {
-                this.$router.push('/cart');
-                this.showSku = false
-            })
-        },
-        onAddCartClicked(skuData) {
-            let cartData = {idGoods:skuData.goodsId,idSku:this.sku.none_sku?'':skuData.selectedSkuComb.id,count:skuData.selectedNum}
-            cart.add(cartData).then( response => {
-                console.log(response)
-                Toast.success('已加入到购物车')
-                this.showSku = false
-                this.cartCount += response.data
-            })
-
-        }
-    }
-};
+import goods from '@/api/goods'
+import cart from '@/api/cart'
+import favorite from '@/api/favorite'
+import storage from '@/utils/storage'
+
+import {
+	Cell,
+	CellGroup,
+	Col,
+	GoodsAction,
+	GoodsActionButton,
+	GoodsActionIcon,
+	Icon,
+	Sku,
+	Swipe,
+	SwipeItem,
+	Tabbar,
+	TabbarItem,
+	Tag,
+	Toast,
+	Button
+} from 'vant';
+
+const baseApi = process.env.VUE_APP_BASE_API
+
+export default {
+	components: {
+		[Tag.name]: Tag,
+		[Col.name]: Col,
+		[Icon.name]: Icon,
+		[Cell.name]: Cell,
+		[CellGroup.name]: CellGroup,
+		[Swipe.name]: Swipe,
+		[SwipeItem.name]: SwipeItem,
+		[GoodsAction.name]: GoodsAction,
+		[GoodsActionIcon.name]: GoodsActionIcon,
+		[GoodsActionButton.name]: GoodsActionButton,
+		[Tabbar.name]: Tabbar,
+		[TabbarItem.name]: TabbarItem,
+		[Sku.name]: Sku,
+		[Button.name]: Button
+	},
+
+	data() {
+		return {
+			ifLike: false,
+			likeColor: 'black',
+			cartCount: '',
+			showSku: false,
+			sku: {
+				tree: [],
+
+				list: [],
+				price: '0', // 默认价格（单位元）
+				stock_num: 20, // 商品总库存
+				collection_id: 0, // 无规格商品 skuId 取 collection_id，否则取所选 sku 组合对应的 id
+				none_sku: false, // 是否无规格商品
+				hide_stock: false // 是否隐藏剩余库存
+			},
+			offline: false,
+			goods: {
+				name: '',
+				price: 0,
+				express: '免运费',
+				remain: 0,
+				thumb: []
+			}
+		};
+	},
+	created() {
+		this.init()
+	},
+	computed: {
+
+	},
+	methods: {
+		init() {
+			let id = this.$route.params.id
+			goods.getGoods(id).then(response => {
+				let goods = response.data.goods
+				this.offline = !goods.isOnSale
+				let sku = response.data.sku
+				sku.price = (sku.price / 100).toFixed(2)
+				this.sku = sku
+				goods.thumb = new Array()
+				goods.picture = baseApi + '/file/getImgStream?idFile=' + goods.pic
+				const gallery = goods.gallery.split(',')
+				for (var index in gallery) {
+					goods.thumb.push(baseApi + '/file/getImgStream?idFile=' + gallery[index])
+				}
+				this.goods = goods
+
+				const user = storage.getUser()
+				if (user.nickName) {
+					//获取当前用户购物车商品数量
+					cart.count().then(response => {
+						this.cartCount = response.data === 0 ? '' : response.data
+					}).catch((err) => {
+
+					})
+					//判断当前用户是否收藏该产品
+					favorite.ifLike(this.goods.id).then(response => {
+						if (response.data === true) {
+							this.likeColor = 'red'
+							this.ifLike = true
+						}
+					}).catch((err) => {
+
+					})
+				}
+			}).catch((err) => {
+				console.log('err', err)
+				Toast(err)
+			})
+
+		},
+		toHome() {
+			this.$router.push('/index')
+		},
+		formatPrice() {
+			return '¥' + (this.goods.price / 100).toFixed(2)
+		},
+		goToCart() {
+			this.$linkTo('/cart')
+		},
+		addCart() {
+			this.showSku = true;
+		},
+		buy() {
+			this.showSku = true
+		},
+		sorry() {
+			Toast('敬请期待')
+		},
+		like() {
+			if (this.ifLike === false) {
+				favorite.add(this.goods.id).then(response => {
+					Toast('收藏成功')
+					this.ifLike = true
+					this.likeColor = 'red'
+				})
+			} else {
+				favorite.dislike(this.goods.id).then(response => {
+					Toast('取消收藏成功')
+					this.ifLike = false
+					this.likeColor = 'black'
+				})
+
+			}
+		},
+		onBuyClicked(skuData) {
+			let cartData = {
+				idGoods: skuData.goodsId,
+				idSku: this.sku.none_sku ? '' : skuData.selectedSkuComb.id,
+				count: skuData.selectedNum
+			}
+			cart.add(cartData).then(response => {
+				this.$linkTo('/cart');
+				this.showSku = false
+			})
+		},
+		onAddCartClicked(skuData) {
+			let cartData = {
+				idGoods: skuData.goodsId,
+				idSku: this.sku.none_sku ? '' : skuData.selectedSkuComb.id,
+				count: skuData.selectedNum
+			}
+			cart.add(cartData).then(response => {
+				Toast.success('已加入到购物车')
+				this.showSku = false
+				this.cartCount += response.data
+			})
+
+		}
+	}
+};

virgo.wzfrontend/shop/shop-mobile/src/view/goods/index.vue

@@ -1,131 +1,128 @@
-<template>
-    <div class="goods" v-if="!offline">
-        <van-swipe class="goods-swipe" :autoplay="3000">
-            <van-swipe-item v-for="thumb in goods.thumb" :key="thumb">
-                <img :src="thumb">
-            </van-swipe-item>
-        </van-swipe>
-
-        <van-cell-group>
-            <van-cell>
-                <div class="goods-title">{{ goods.name }}</div>
-                <div class="goods-desc">{{ goods.descript }}</div>
-                <div class="goods-price">{{ formatPrice(goods.price) }}</div>
-            </van-cell>
-            <van-cell class="goods-express">
-                <van-col span="10">运费：免运费</van-col>
-                <van-col span="14">剩余：{{ goods.stock }}</van-col>
-            </van-cell>
-        </van-cell-group>
-
-        <!--<van-cell-group class="goods-cell-group">-->
-        <!--<van-cell value="进入店铺" icon="shop-o" is-link @click="sorry">-->
-        <!--<template slot="title">-->
-        <!--<span class="van-cell-text">有赞的店</span>-->
-        <!--<van-tag class="goods-tag" type="danger">官方</van-tag>-->
-        <!--</template>-->
-        <!--</van-cell>-->
-        <!--s-->
-        <!--</van-cell-group>-->
-
-        <van-cell-group class="goods-cell-group">
-            <van-cell title="查看商品评论" is-link @click="sorry"/>
-        </van-cell-group>
-        <van-cell-group class="goods-cell-group">
-            <p class="goods-detail" v-html="goods.detail"></p>
-        </van-cell-group>
-        <van-goods-action>
-            <van-goods-action-icon icon="home-o" @click="toHome" text="主页"/>
-            <van-goods-action-icon icon="like-o"  @click="like" :color="likeColor" text="喜欢"/>
-            <van-goods-action-icon icon="cart-o" @click="goToCart" :info="cartCount" text="购物车"/>
-            <van-goods-action-button type="danger" @click="addCart" text="立即购买"/>
-        </van-goods-action>
-        <van-sku
-                v-model="showSku"
-                :sku="sku"
-                :goods="goods"
-                :goods-id="goods.id"
-                :hide-stock="sku.hide_stock"
-                @buy-clicked="onBuyClicked"
-                @add-cart="onAddCartClicked"
-        />
-    </div>
-
-    <div class="offline" v-else>
-        <p style="text-align: center;color:lightgray">
-            <van-icon name="warning-o" style="text-align: center" size="3rem"/><br>
-            改商品已下架</p>
-        <van-button type="primary" block round @click="toHome">去看看其他商品</van-button>
-    </div>
-</template>
-
-<script src="./goods.js"></script>
-
-<style lang="less">
-    img {
-        width: 100%;
-    }
-
-    .section-detail {
-        margin-top: -4px;
-    }
-    .like-info {
-       color:black;
-    }
-    .like-red {
-        color:red !important;
-    }
-    .goods {
-        padding-bottom: 50px;
-
-        &-swipe {
-            img {
-                width: 100%;
-                height: 450px;
-                display: block;
-            }
-        }
-
-        &-desc {
-            font-size: 12px;
-            color: #999999;
-            letter-spacing: 0;
-            line-height: 18px;
-            margin: 6px 0;
-        }
-
-        &-detail {
-            padding: 15px;
-            font-size: 14px;
-        }
-
-        &-title {
-            font-size: 16px;
-        }
-
-        &-price {
-            color: #f44;
-        }
-
-        &-express {
-            color: #999;
-            font-size: 12px;
-            padding: 5px 15px;
-        }
-
-        &-cell-group {
-            margin: 15px 0;
-
-            .van-cell__value {
-                color: #999;
-            }
-        }
-
-        &-tag {
-            margin-left: 5px;
-        }
-    }
-    .offline{
-        margin-top:60%;
-    }
-</style>
+<template>
+	<div class="goods" v-if="!offline">
+		<van-swipe class="goods-swipe" :autoplay="3000">
+			<van-swipe-item v-for="thumb in goods.thumb" :key="thumb">
+				<img :src="thumb">
+			</van-swipe-item>
+		</van-swipe>
+
+		<van-cell-group>
+			<van-cell>
+				<div class="goods-title">{{ goods.name }}</div>
+				<div class="goods-desc">{{ goods.descript }}</div>
+				<div class="goods-price">{{ formatPrice(goods.price) }}</div>
+			</van-cell>
+			<van-cell class="goods-express">
+				<van-col span="10">运费：免运费</van-col>
+				<van-col span="14">剩余：{{ goods.stock }}</van-col>
+			</van-cell>
+		</van-cell-group>
+
+		<!--<van-cell-group class="goods-cell-group">-->
+		<!--<van-cell value="进入店铺" icon="shop-o" is-link @click="sorry">-->
+		<!--<template slot="title">-->
+		<!--<span class="van-cell-text">有赞的店</span>-->
+		<!--<van-tag class="goods-tag" type="danger">官方</van-tag>-->
+		<!--</template>-->
+		<!--</van-cell>-->
+		<!--s-->
+		<!--</van-cell-group>-->
+
+		<van-cell-group class="goods-cell-group">
+			<van-cell title="查看商品评论" is-link @click="sorry" />
+		</van-cell-group>
+		<van-cell-group class="goods-cell-group">
+			<p class="goods-detail" v-html="goods.detail"></p>
+		</van-cell-group>
+		<van-goods-action>
+			<van-goods-action-icon icon="like-o" @click="like" :color="likeColor" text="喜欢" />
+			<van-goods-action-icon icon="cart-o" @click="goToCart" :info="cartCount" text="购物车" />
+			<van-goods-action-button type="danger" @click="addCart" text="立即购买" />
+		</van-goods-action>
+		<van-sku v-model="showSku" :sku="sku" :goods="goods" :goods-id="goods.id" :hide-stock="sku.hide_stock"
+			@buy-clicked="onBuyClicked" @add-cart="onAddCartClicked" />
+	</div>
+
+	<div class="offline" v-else>
+		<p style="text-align: center;color:lightgray">
+			<van-icon name="warning-o" style="text-align: center" size="3rem" /><br>
+			改商品已下架
+		</p>
+		<van-button type="primary" block round @click="toHome">去看看其他商品</van-button>
+	</div>
+</template>
+
+<script src="./goods.js"></script>
+
+<style lang="less">
+	img {
+		width: 100%;
+	}
+
+	.section-detail {
+		margin-top: -4px;
+	}
+
+	.like-info {
+		color: black;
+	}
+
+	.like-red {
+		color: red !important;
+	}
+
+	.goods {
+		padding-bottom: 50px;
+
+		&-swipe {
+			img {
+				width: 100%;
+				height: 450px;
+				display: block;
+			}
+		}
+
+		&-desc {
+			font-size: 12px;
+			color: #999999;
+			letter-spacing: 0;
+			line-height: 18px;
+			margin: 6px 0;
+		}
+
+		&-detail {
+			padding: 15px;
+			font-size: 14px;
+		}
+
+		&-title {
+			font-size: 16px;
+		}
+
+		&-price {
+			color: #f44;
+		}
+
+		&-express {
+			color: #999;
+			font-size: 12px;
+			padding: 5px 15px;
+		}
+
+		&-cell-group {
+			margin: 15px 0;
+
+			.van-cell__value {
+				color: #999;
+			}
+		}
+
+		&-tag {
+			margin-left: 5px;
+		}
+	}
+
+	.offline {
+		margin-top: 60%;
+	}
+</style>

virgo.wzfrontend/shop/shop-mobile/src/view/index/welcome.js

@@ -154,24 +154,7 @@ export default {
 		},
 		clickSwipe(index, p2) {},
 		viewGoodsDetail(id) {
-			const ua = navigator.userAgent.toLowerCase();
-			console.log(ua);
-			if (ua.match(/MicroMessenger/i) == "micromessenger") {
-				wx.miniProgram.getEnv((res) => {
-					if (res.miniprogram) {
-						wx.miniProgram.navigateTo({
-							url: '/subPages/shopPage/webview/webview?url=/goods/' + id
-						})
-					} else {
-						alert("不在小程序里");
-					}
-				})
-			} else {
-				console.log('---');
-				this.$router.push({
-					path: '/goods/' + id
-				})
-			}
+			this.$linkTo('/goods/' + id);
 		},
 		formatPrice(price) {
 			return (price / 100).toFixed(2)

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

@@ -1,98 +1,132 @@
-import order  from '@/api/orders'
-import {Card, Cell, CellGroup, Checkbox, CheckboxGroup, NavBar, SubmitBar, Tabbar, TabbarItem, Toast} from 'vant';
-import storage from '@/utils/storage'
-const baseApi = process.env.VUE_APP_BASE_API
-export default {
-    components: {
-        [Card.name]: Card,
-        [Checkbox.name]: Checkbox,
-        [SubmitBar.name]: SubmitBar,
-        [CheckboxGroup.name]: CheckboxGroup,
-        [NavBar.name]: NavBar,
-        [Tabbar.name]: Tabbar,
-        [TabbarItem.name]: TabbarItem,
-        [Cell.name]: Cell,
-        [CellGroup.name]: CellGroup
-    },
-
-    data() {
-        return {
-            activeFooter: 2,
-            checkedGoods: [],
-            checkeAllCarts: [],
-            cartList: [],
-            idCartList:[],
-            checkedAll: true,
-            addr: undefined,
-            message:''
-        };
-    },
-    mounted() {
-        this.idCartList = this.$route.query.ids
-        if (typeof this.idCartList === 'string') {
-            this.idCartList = new Array(this.idCartList);
-        }
-        this.init()
-    },
-    computed: {
-        addrText(){
-          if(this.addr){
-              return this.addr.name+'('+this.addr.tel+')'
-          }else{
-              return ''
-          }
-        },
-        submitBarText() {
-            const count = this.checkedGoods.length;
-            return '提交订单' + (count ? `(${count})` : '')
-        },
-        totalPrice() {
-            return this.cartList.reduce((total, item) => total + (this.checkedGoods.indexOf(item.id) !== -1 ? (parseFloat(item.price) * item.count) : 0), 0)
-        }
-    },
-
-    methods: {
-        init() {
-            const chosenAddressId = storage.get('chosenAddressId')
-            order.prepareCheckout({chosenAddressId:chosenAddressId,idCarts:this.idCartList.join(',')}).then(response => {
-                let cartList = response.data.list
-                this.addr = response.data.addr
-                for (let index in cartList) {
-                    cartList[index].thumb = baseApi+ '/file/getImgStream?idFile=' + cartList[index].goods.pic
-                    this.checkedGoods.push(cartList[index].id )
-                }
-                this.cartList = cartList
-            }).catch((err) => {
-                Toast(err)
-            })
-        },
-        submit() {
-            if(!this.addr || !this.addr.id){
-                this.$router.push({path:'address'})
-                return
-            }
-            order.save({idAddress:this.addr.id,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}})
-            })
-        },
-        formatPrice(price) {
-            return (price / 100).toFixed(2);
-        },
-        stepperEvent(item, arg) {
-            let count = arg[0];
-            cart.update({id: item.id, count: count})
-        },
-        checkAll() {
-            if (this.checkedGoods.length === this.cartList.length) {
-                this.checkeAllCarts = this.checkedGoods
-                this.checkedGoods = []
-            } else {
-                this.checkedGoods = this.checkeAllCarts
-            }
-        },
-        chooseAddress(){
-
-        }
-    }
-};
+import order from '@/api/orders'
+import {
+	Card,
+	Checkbox,
+	CheckboxGroup,
+	NavBar,
+	SubmitBar,
+	Tabbar,
+	TabbarItem,
+	Toast,
+	ContactCard
+} from 'vant';
+import storage from '@/utils/storage'
+const baseApi = process.env.VUE_APP_BASE_API
+export default {
+	components: {
+		[Card.name]: Card,
+		[Checkbox.name]: Checkbox,
+		[SubmitBar.name]: SubmitBar,
+		[CheckboxGroup.name]: CheckboxGroup,
+		[NavBar.name]: NavBar,
+		[Tabbar.name]: Tabbar,
+		[TabbarItem.name]: TabbarItem,
+		[ContactCard.name]: ContactCard
+	},
+	data() {
+		return {
+			activeFooter: 2,
+			checkedGoods: [],
+			checkeAllCarts: [],
+			cartList: [],
+			idCartList: [],
+			checkedAll: true,
+			addr: undefined,
+			message: ''
+		};
+	},
+	mounted() {
+		this.idCartList = this.$route.query.ids
+		if (typeof this.idCartList === 'string') {
+			this.idCartList = new Array(this.idCartList);
+		}
+		this.init()
+	},
+	computed: {
+		addrText() {
+			if (this.addr) {
+				return {
+					name: this.addr.name,
+					tel: this.addr.tel
+				}
+			} else {
+				return {
+					name: '',
+					tel: ''
+				}
+			}
+		},
+		submitBarText() {
+			const count = this.checkedGoods.length;
+			return '提交订单' + (count ? `(${count})` : '')
+		},
+		totalPrice() {
+			return this.cartList.reduce((total, item) => total + (this.checkedGoods.indexOf(item.id) !== -1 ? (
+				parseFloat(item.price) * item.count) : 0), 0)
+		}
+	},
+
+	methods: {
+		init() {
+			const chosenAddressId = storage.get('chosenAddressId')
+			order.prepareCheckout({
+				chosenAddressId: chosenAddressId,
+				idCarts: this.idCartList.join(',')
+			}).then(response => {
+				let cartList = response.data.list
+				this.addr = response.data.addr
+				for (let index in cartList) {
+					cartList[index].thumb = baseApi + '/file/getImgStream?idFile=' + cartList[index].goods.pic
+					this.checkedGoods.push(cartList[index].id)
+				}
+				this.cartList = cartList
+			}).catch((err) => {
+				Toast(err)
+			})
+		},
+		address() {
+			this.$linkTo('/address');
+		},
+		submit() {
+			if (!this.addr || !this.addr.id) {
+				this.$linkTo('/address');
+				return
+			}
+			order.save({
+				idAddress: this.addr.id,
+				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
+					}
+				})
+			})
+		},
+		formatPrice(price) {
+			return (price / 100).toFixed(2);
+		},
+		stepperEvent(item, arg) {
+			let count = arg[0];
+			cart.update({
+				id: item.id,
+				count: count
+			})
+		},
+		checkAll() {
+			if (this.checkedGoods.length === this.cartList.length) {
+				this.checkeAllCarts = this.checkedGoods
+				this.checkedGoods = []
+			} else {
+				this.checkedGoods = this.checkeAllCarts
+			}
+		},
+		chooseAddress() {
+
+		}
+	}
+};

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

@@ -1,70 +1,56 @@
-<template>
-    <div>
-        <van-cell-group>
-        <van-cell :title="addrText" is-link to="address"/>
-        </van-cell-group>
-            <div   v-for="item in cartList"
-                   :key="item.id"    class="card-goods__item">
-                <van-card
-                        style="margin-left:15px;"
-                        :title="item.title"
-                        :desc="item.goods.descript"
-                        :num="item.count"
-                        :price="formatPrice(item.price)"
-                        :thumb="item.thumb"
-                >
-                </van-card>
-            </div>
-
-        <van-submit-bar
-                :price="totalPrice"
-                :disabled="!checkedGoods.length"
-                :button-text="submitBarText"
-                @submit="submit"
-        >
-
-        </van-submit-bar>
-
-        <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="./checkout.js"></script>
-
-<style lang="less">
-    .van-submit-bar{
-        bottom:48px;
-    }
-    .card-goods {
-        background-color: #fff;
-
-        &__item {
-            position: relative;
-            background-color: #fafafa;
-
-            .van-checkbox__label {
-                width: 100%;
-                height: auto; // temp
-                padding: 0 10px 0 15px;
-                box-sizing: border-box;
-            }
-
-            .van-checkbox__icon {
-                top: 50%;
-                left: 10px;
-                z-index: 1;
-                position: absolute;
-                margin-top: -10px;
-            }
-
-            .van-card__price {
-                color: #f44;
-            }
-        }
-    }
-</style>
+<template>
+	<div>
+		<div class="address-detail">
+			<van-contact-card type="add" @click="address" v-if="!addrText.name" />
+			<van-contact-card type="edit" :name="addrText.name" :tel="addrText.tel" @click="address" v-else />
+		</div>
+		<div v-for="item in cartList" :key="item.id" class="card-goods__item">
+			<van-card style="margin-left:15px;" :title="item.title" :desc="item.goods.descript" :num="item.count"
+				:price="formatPrice(item.price)" :thumb="item.thumb">
+			</van-card>
+		</div>
+		<van-submit-bar :price="totalPrice" :disabled="!checkedGoods.length" :button-text="submitBarText"
+			@submit="submit">
+		</van-submit-bar>
+	</div>
+</template>
+
+<script src="./checkout.js"></script>
+
+<style lang="less">
+	.van-submit-bar {
+		bottom: 0px;
+	}
+
+	.address-detail {
+		margin-bottom: 15px;
+	}
+
+	.card-goods {
+		background-color: #fff;
+
+		&__item {
+			position: relative;
+			background-color: #fafafa;
+
+			.van-checkbox__label {
+				width: 100%;
+				height: auto; // temp
+				padding: 0 10px 0 15px;
+				box-sizing: border-box;
+			}
+
+			.van-checkbox__icon {
+				top: 50%;
+				left: 10px;
+				z-index: 1;
+				position: absolute;
+				margin-top: -10px;
+			}
+
+			.van-card__price {
+				color: #f44;
+			}
+		}
+	}
+</style>

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

@@ -1,96 +1,59 @@
-<template>
-  <div>
-    <van-nav-bar
-            title="我的订单"
-            left-arrow
-            @click-left="onClickLeft"
-    />
-    <van-tabs v-model="activeNav" @click="clickNav">
-      <van-tab v-for="nav in navList" :title="nav.name" v-bind:key="nav.id">
-      </van-tab>
-    </van-tabs>
-    <div class="order_list">
-    <van-list v-model="loading"
-              :finished="finished"
-              :immediate-check="false"
-              finished-text="没有更多了"
-              @load="getData">
-      <van-panel v-for="(item, index) in orderList"
-                 :key="index"
-                 :title="'订单编号: ' + item.orderSn"
-                 :status="item.statusName"
-                 @click.native="toOrderDetail(item.orderSn)"
-      >
-        <van-card v-for="(orderItem, index2) in item.items"
-                  :key="index2"
-                  :title="orderItem.title"
-                  :desc="orderItem.goods.descript"
-                  :price="formatPrice(orderItem.price)"
-                  :num="orderItem.count"
-                  @click.stop="toGoods(orderItem.goods.id)"
-                  :thumb="imgUrl+orderItem.goods.pic">
-          <!--<div slot="desc">-->
-            <!--<div class="desc">-->
-              <!--<van-tag plain-->
-                       <!--style="margin-right:6px;"-->
-                       <!--v-for="(spec, index) in goods.specifications"-->
-                       <!--:key="index">-->
-                <!--{{spec}}-->
-              <!--</van-tag>-->
-            <!--</div>-->
-          <!--</div>-->
-        </van-card>
-        <div class="total">合计: {{formatPrice(item.totalPrice)}} </div>
-
-        <div slot="footer"
-             class="footer_btn">
-          <van-button size="small" @click.stop="cancelOrder(item)"  v-show="item.statusName === '待付款'" type="default">取消订单</van-button>
-          <van-button size="small" @click.stop="viewExpressInfo(item.orderSn)"  v-show="item.statusName === '已发货' || item.statusName === '已完成'" type="info">查看物流</van-button>
-
-          <van-button size="small" @click.stop="handleOrder(item)"  type="danger">
-            {{getHandlerText(item.statusName)}}
-          </van-button>
-
-        </div>
-
-      </van-panel>
-
-    </van-list>
-    </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="./orders.js"></script>
-
-<style lang="less">
-  .order_list {
-    .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>
+		<van-tabs v-model="activeNav" @click="clickNav">
+			<van-tab v-for="nav in navList" :title="nav.name" v-bind:key="nav.id">
+			</van-tab>
+		</van-tabs>
+		<div class="order_list">
+			<van-list v-model="loading" :finished="finished" :immediate-check="false" finished-text="没有更多了"
+				@load="getData">
+				<van-panel v-for="(item, index) in orderList" :key="index" :title="'订单编号: ' + item.orderSn"
+					:status="item.statusName" @click.native="toOrderDetail(item.orderSn)">
+					<van-card v-for="(orderItem, index2) in item.items" :key="index2" :title="orderItem.title"
+						:desc="orderItem.goods.descript" :price="formatPrice(orderItem.price)" :num="orderItem.count"
+						@click.stop="toGoods(orderItem.goods.id)" :thumb="imgUrl+orderItem.goods.pic">
+					</van-card>
+					<div class="total">合计: {{formatPrice(item.totalPrice)}} </div>
+					<div slot="footer" class="footer_btn">
+						<van-button size="small" @click.stop="cancelOrder(item)" v-show="item.statusName === '待付款'"
+							type="default">取消订单</van-button>
+						<van-button size="small" @click.stop="viewExpressInfo(item.orderSn)"
+							v-show="item.statusName === '已发货' || item.statusName === '已完成'" type="info">
+							查看物流
+						</van-button>
+						<van-button size="small" @click.stop="handleOrder(item)" type="danger">
+							{{getHandlerText(item.statusName)}}
+						</van-button>
+					</div>
+				</van-panel>
+			</van-list>
+		</div>
+	</div>
+</template>
+
+<script src="./orders.js"></script>
+
+<style lang="less">
+	.order_list {
+		.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/shop/shop-mobile/src/view/order/orders.js

@@ -1,130 +1,161 @@
- import order  from '@/api/orders'
-import { 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: {
-        [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 {
-            navList: [
-                {name:'全部',id:0},
-                {name:'待付款',id:1},
-                {name:'待发货',id:2},
-                {name:'已发货',id:3},
-                {name:'已完成',id:4},
-            ],
-            orderList:[],
-            activeNav: 0,
-            activeFooter: 3,
-            checkedGoods: ['1'],
-            goods: [ ],
-            imgUrl:baseApi+'/file/getImgStream?idFile=',
-            listQuery: {
-                page: 1,
-                limit: 20,
-                status: 0
-            },
-            loading: false,
-            finished: false
-        };
-    },
-    mounted(){
-        if(this.$route.query){
-            let status = this.$route.query.status
-            //使用状态减一作为导航栏的序号，如果状态值改变，则不能使用该方法
-            this.activeNav = parseInt(status)-1
-            this.listQuery.status = status
-        }
-      this.init()
-    },
-    computed: {
-        submitBarText() {
-            const count = this.checkedGoods.length;
-            return '结算' + (count ? `(${count})` : '');
-        },
-    },
-
-    methods: {
-        init(){
-            this.getData()
-
-        },
-        getData(){
-            order.getOrders(this.listQuery).then( response => {
-                let orderList = response.data.records
-                for(let index in  orderList){
-                    let orders = orderList[index]
-                    orders.title=''+orders.createTime
-                    orders.descript = ''+orders.orderSn
-                }
-                this.orderList = orderList
-                this.loading = false
-                this.finished= (response.data.total === 0 || (response.data.current === response.data.pages))
-            }).catch( (err) => {
-
-            })
-        },
-        formatPrice(price) {
-            return (price / 100).toFixed(2);
-        },
-        onClickLeft(){
-            this.$router.go(-1)
-        },
-        clickNav(index,title){
-            this.activeNav = index;
-            this.listQuery.status = this.navList[index].id
-            this.getData()
-        },
-        toOrderDetail(orderSn){
-            this.$router.push('/order/detail/'+orderSn)
-        },
-        toGoods(id){
-            this.$router.push({path: '/goods/'+id})
-        },
-        cancelOrder(orderInfo){
-            order.remove(orderInfo.orderSn).then( response => {
-                this.getData()
-            })
-        },
-        viewExpressInfo(orderSn){
-            this.$router.push('/order/expressInfo/'+orderSn)
-        },
-        getHandlerText(statusName){
-            if(statusName==='已发货'){
-                return '确认收货'
-            }
-            if(statusName==='待付款') {
-                return '立即付款'
-            }
-            return statusName
-        },
-        handleOrder(orderInfo){
-            if(orderInfo.statusName==='待付款'){
-                this.$router.push({path:'payment',query:{orderSn:orderInfo.orderSn,totalPrice:orderInfo.totalPrice}})
-            }
-            if(orderInfo.statusName==='已发货'){
-                order.confirm(orderInfo.orderSn).then( response => {
-                    Toast('成功收货')
-                    this.getData()
-                })
-            }
-        }
-    }
-}
+import order from '@/api/orders'
+import {
+	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: {
+		[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 {
+			navList: [{
+				name: '全部',
+				id: 0
+			}, {
+				name: '待付款',
+				id: 1
+			}, {
+				name: '待发货',
+				id: 2
+			}, {
+				name: '已发货',
+				id: 3
+			}, {
+				name: '已完成',
+				id: 4
+			}],
+			orderList: [],
+			activeNav: 0,
+			activeFooter: 3,
+			checkedGoods: ['1'],
+			goods: [],
+			imgUrl: baseApi + '/file/getImgStream?idFile=',
+			listQuery: {
+				page: 1,
+				limit: 20,
+				status: 0
+			},
+			loading: false,
+			finished: false
+		};
+	},
+	mounted() {
+		if (this.$route.query) {
+			let status = this.$route.query.status
+			//使用状态减一作为导航栏的序号，如果状态值改变，则不能使用该方法
+			this.activeNav = parseInt(status) - 1
+			this.listQuery.status = status
+		}
+		this.init()
+	},
+	computed: {
+		submitBarText() {
+			const count = this.checkedGoods.length;
+			return '结算' + (count ? `(${count})` : '');
+		},
+	},
+
+	methods: {
+		init() {
+			this.getData()
+
+		},
+		getData() {
+			order.getOrders(this.listQuery).then(response => {
+				let orderList = response.data.records
+				for (let index in orderList) {
+					let orders = orderList[index]
+					orders.title = '' + orders.createTime
+					orders.descript = '' + orders.orderSn
+				}
+				this.orderList = orderList
+				this.loading = false
+				this.finished = (response.data.total === 0 || (response.data.current === response.data.pages))
+			}).catch((err) => {
+
+			})
+		},
+		formatPrice(price) {
+			return (price / 100).toFixed(2);
+		},
+		clickNav(index, title) {
+			this.activeNav = index;
+			this.listQuery.status = this.navList[index].id
+			this.getData()
+		},
+		toOrderDetail(orderSn) {
+			this.$linkTo('/order/detail/' + orderSn);
+		},
+		toGoods(id) {
+			this.$linkTo('/goods/' + id);
+		},
+		cancelOrder(orderInfo) {
+			order.remove(orderInfo.orderSn).then(response => {
+				this.getData()
+			})
+		},
+		viewExpressInfo(orderSn) {
+			this.$linkTo('/order/expressInfo/' + orderSn);
+		},
+		getHandlerText(statusName) {
+			if (statusName === '已发货') {
+				return '确认收货'
+			}
+			if (statusName === '待付款') {
+				return '立即付款'
+			}
+			return statusName
+		},
+		handleOrder(orderInfo) {
+			if (orderInfo.statusName === '待付款') {
+				this.$wxEnv(() => {
+					wx.miniProgram.navigateTo({
+						url: '/subPages/shopPage/payment/payment?orderSn=' + orderInfo.orderSn +
+							'&totalPrice=' + orderInfo.totalPrice
+					})
+				}, () => {
+					this.router.push({
+						path: '/payment?orderSn=' + orderInfo.orderSn + '&totalPrice=' + orderInfo
+							.totalPrice
+					})
+				})
+			}
+			if (orderInfo.statusName === '已发货') {
+				order.confirm(orderInfo.orderSn).then(response => {
+					Toast('成功收货')
+					this.getData()
+				})
+			}
+		}
+	}
+}

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

@@ -1,61 +1,40 @@
-<template>
-    <div>
-        <van-nav-bar
-                title="收银台"
-        />
-        <van-cell-group>
-            <van-cell title="订单编号" :value="order.orderSn"/>
-            <van-cell title="应付金额">
-                <span class="red strong">￥{{formatPrice(order.totalPrice)}}</span>
-            </van-cell>
-        </van-cell-group>
-
-        <van-radio-group v-model="payType">
-            <van-cell-group>
-                <van-cell clickable @click="radio = 'wxpay'">
-                    <img
-
-                            style="height:32px;width:120px;"
-                            slot="icon"
-                            slot-scope="props"
-                            src="@/assets/img/wxpay.png"
-                    >
-                    <van-radio slot="right-icon" name="wxpay" style="padding-left:40%;"/>
-                </van-cell>
-                <van-cell clickable @click="radio = 'alipay'">
-                    <img
-
-                            style="height:32px;width:120px;"
-                            slot="icon"
-                            slot-scope="props"
-                            src="@/assets/img/alipay.png"
-                    >
-                    <van-radio slot="right-icon" name="alipay"  style="padding-left:40%;"/>
-                </van-cell>
-            </van-cell-group>
-        </van-radio-group>
-        <van-button class="footer" type="primary" size="large" @click="pay">立即支付</van-button>
-
-    </div>
-</template>
-
-<script src="./payment.js"></script>
-
-<style lang="less">
-    .red {
-        color: red;
-    }
-
-    .strong {
-        font-weight: bold;
-    }
-
-    .van-cell-group {
-        margin-top: 10px;
-    }
-
-    .footer {
-        position: fixed;
-        bottom: 0px;
-    }
-</style>
+<template>
+	<div>
+		<van-cell-group>
+			<van-cell title="订单编号" :value="order.orderSn" />
+			<van-cell title="应付金额">
+				<span class="red strong">￥{{formatPrice(order.totalPrice)}}</span>
+			</van-cell>
+		</van-cell-group>
+		<van-radio-group v-model="payType">
+			<van-cell-group>
+				<van-cell clickable @click="radio = 'wxpay'">
+					<img style="height:32px;width:120px;" slot="icon" slot-scope="props" src="@/assets/img/wxpay.png">
+					<van-radio slot="right-icon" name="wxpay" style="padding-left:40%;" />
+				</van-cell>
+			</van-cell-group>
+		</van-radio-group>
+		<van-button class="footer" type="primary" size="large" @click="pay">立即支付</van-button>
+	</div>
+</template>
+
+<script src="./payment.js"></script>
+
+<style lang="less">
+	.red {
+		color: red;
+	}
+
+	.strong {
+		font-weight: bold;
+	}
+
+	.van-cell-group {
+		margin-top: 10px;
+	}
+
+	.footer {
+		position: fixed;
+		bottom: 0px;
+	}
+</style>

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

@@ -66,9 +66,9 @@ export default {
 					timeStamp: data.timeStamp
 				})
 			}).catch(err => {
-				Toast('123123')
+				alert(err)
+				// Toast(err)
 			})
-
 		},
 		wxPay: function(data) {
 			//获取后台传入的数据

virgo.wzfrontend/workark_wx/pages.json

@@ -73,6 +73,11 @@
 			"style": {
 				"navigationBarTitleText": ""
 			}
+		}, {
+			"path": "payment/payment",
+			"style": {
+				"navigationBarTitleText": "收银台"
+			}
 		}]
 	}, {
 		"root": "subPages/indexPage",

virgo.wzfrontend/workark_wx/pages/my/my.vue

@@ -12,6 +12,17 @@
 			</view>
 			<view class="my-list">
 				<view class="my-list-box">
+					<view class="my-item" @tap="$navigateTo('/subPages/shopPage/webview/webview?url=/order')">
+						<view class="my-icon bg3">
+							<uv-icon name="home-fill" color="#fff" size="56"></uv-icon>
+						</view>
+						<view class="item-content">
+							商城订单
+						</view>
+						<view class="my-forward">
+							<uv-icon name="arrow-right" color="#c1c0c8" size="32"></uv-icon>
+						</view>
+					</view>
 					<view class="my-item" @tap="$navigateTo('/subPages/myPage/organization/organization')">
 						<view class="my-icon bg3">
 							<uv-icon name="home-fill" color="#fff" size="56"></uv-icon>
@@ -84,7 +95,7 @@
 				let userInfo = await getUserInfoById(this.user.userId);
 				if (userInfo.state) {
 					this.user['userName'] = userInfo.data.name;
-					this.user['userId'] = userInfo.data.id;
+					this.user['userId'] = userInfo.data.id;
 					this.user['portrait'] = userInfo.data.portrait;
 					this.$store.dispatch('app/changeUser', this.user);
 				}

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

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<web-view v-if="webviewUrl" :src="webviewUrl" id="webview"></web-view>
+		<web-view v-if="webviewUrl" :src="webviewUrl"></web-view>
 	</view>
 </template>
 

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

@@ -0,0 +1,26 @@
+import {
+	request
+} from '@/request/request.js';
+const baseUrl = '/prod-api/mobile-api';
+/* 
+ * 获取订单信息
+ * 
+ * 
+ */
+export function getOrderResult(orderSn) {
+	return request({
+		url: `${baseUrl}/pay/queryResult/${orderSn}`,
+		method: 'get'
+	})
+}
+/* 
+ * 获取订单信息
+ * 
+ * 
+ */
+export function getPaymentInformation(orderSn) {
+	return request({
+		url: `${baseUrl}/pay/wx/prepare?orderSn=${orderSn}`,
+		method: 'post'
+	})
+}

virgo.wzfrontend/workark_wx/request/request.js

@@ -5,8 +5,8 @@ const logout = () => {
 	chat.disConnect();
 	uni.removeStorageSync('token');
 	uni.removeStorageSync('chatToken');
-	uni.removeStorageSync('vuex_state');
-	uni.removeStorageSync('serveChatToken');
+	uni.removeStorageSync('vuex_state');
+	uni.removeStorageSync('serveChatToken');
 	uni.removeStorageSync('serveChatId');
 	store.dispatch('app/changeOrganization', {});
 	store.dispatch('app/changeUser', {});
@@ -53,6 +53,8 @@ export function request(options) {
 			'Content-Type': 'application/json'
 		}
 		if (uni.getStorageSync('token')) header['token'] = uni.getStorageSync('token');
+		if (uni.getStorageSync('shopMobileToken')) header['authorization'] = uni.getStorageSync(
+			'shopMobileToken');
 		uni.request({
 			url: config.baseUrl + options.url, // 服务器url
 			method: options.method || 'GET', // 请求方法，默认为GET
@@ -69,7 +71,7 @@ export function request(options) {
 					resolve({
 						state: data.code == '200',
 						data: data.data,
-						msg: data.code == '200' ? 'success' : 'error'
+						msg: (data.code == '200') ? 'success' : 'error'
 					});
 				} else {
 					errorCallBack(resolve);

virgo.wzfrontend/workark_wx/subPages/shopPage/components/callback.vue

@@ -0,0 +1,61 @@
+<template>
+	<view class="wrap">
+		<view class="top">
+			<u-icon name="checkmark-circle-fill" color="#19be6b" size="120" v-if="isSuccess && result!='查询中'"></u-icon>
+			<u-icon name="error-circle-fill" color="#fa3534" size="120" v-if="!isSuccess && result!='查询中'"></u-icon>
+			<view>{{result}}</view>
+		</view>
+		<view class="content" v-if="result!=='查询中'">
+			<u-button type="primary" @click="finish">确定</u-button> 
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				orderSn: '',
+				isSuccess: undefined,
+				result: '查询中'
+			}
+		},
+		onLoad(option) {
+			this.orderSn = option.orderSn
+			this.init()
+		},
+		methods: {
+			init() {
+				this.$u.get('pay/queryResult/' + this.orderSn).then(res => { 
+					if (res == true) {
+						this.result = "支付成功"
+						this.isSuccess = true
+					} else {
+						this.isSuccess = false
+						this.result = "支付失败"
+					}
+				})
+			},
+			finish(){ 
+				this.$u.route({
+					url: '/pages/order/detail',
+					params: {
+						orderSn: this.orderSn
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.wrap {
+		.top {
+			text-align: center;
+			margin:60rpx;
+		}
+		.content{
+			padding:60rpx;
+		}
+	}
+</style>

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

@@ -0,0 +1,131 @@
+<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>
+		</uv-radio-group>
+		<view class="button">
+			<uv-button type="primary" @click="submit">立即支付</uv-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getOrderResult,
+		getPaymentInformation
+	} from '@/request/api/shop.js'
+	export default {
+		data() {
+			return {
+				orderSn: '',
+				totalPrice: '',
+				payType: 'wxpay',
+				payWayList: [{
+					name: 'wxpay',
+					text: '微信支付'
+				}]
+			}
+		},
+		computed: {
+			totalPriceFmt() {
+				return '¥' + (this.totalPrice / 100).toFixed(2)
+			}
+		},
+		onLoad(body) {
+			this.orderSn = body.orderSn
+			this.totalPrice = body.totalPrice;
+			this.init();
+		},
+		methods: {
+			init() {
+				getOrderResult(this.orderSn).then(res => {
+					//如果当前订单已经支付成功跳转到订单详情页
+					if (res.data) {}
+				})
+			},
+			submit() {
+				if ('wxpay' === this.payType) {
+					getPaymentInformation(this.orderSn).then(response => {
+						if (response.state) {
+							let res = response.data;
+							uni.requestPayment({
+								provider: 'wxpay',
+								timeStamp: res.timeStamp, //时间戳
+								nonceStr: res.nonceStr, //随机字符串
+								package: res.packageValue, //统一下单接口返回的 prepay_id 参数值
+								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
+												}
+											})
+										}
+									})
+								},
+								fail: (e) => {
+									this.$toast('取消支付');
+								}
+							})
+						}
+					});
+				}
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss" scoped>
+	.wrap {
+		padding: 30rpx 0rpx;
+
+		.top {
+			display: flex;
+			align-items: center;
+		}
+
+		.item {
+			width: 100%;
+			padding: 20rpx 20rpx;
+		}
+
+		.label {
+			color: #6cac3e;
+			margin-left: 10rpx;
+		}
+
+		.button {
+			padding: 30rpx;
+		}
+	}
+</style>

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

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<web-view v-if="webviewUrl" :src="webviewUrl" id="webview"></web-view>
+		<web-view v-if="webviewUrl" :src="webviewUrl" @message="message"></web-view>
 	</view>
 </template>
 
@@ -13,10 +13,14 @@
 			}
 		},
 		onLoad(body) {
-			this.webviewUrl = config.webviewUrl + body.url + '?token=' + uni.getStorageSync('shopMobileToken');
+			let path = decodeURIComponent(body.url);
+			let link = path.indexOf('?') === -1 ? '?' : '&';
+			this.webviewUrl = config.webviewUrl + path + link + 'token=' + uni.getStorageSync('shopMobileToken');
 		},
 		methods: {
-
+			message(e) {
+				console.log(e.detail);
+			}
 		}
 	}
 </script>

virgo.wzfrontend/workark_wx/uni_modules/uv-cell/components/uv-cell/uv-cell.vue

@@ -9,7 +9,7 @@
 			<view class="uv-cell__body__content">
 				<view class="uv-cell__left-icon-wrap">
 					<slot name="icon">
-						<uv-icon v-if="icon" :name="icon" :custom-style="iconStyle" :size="size === 'large' ? 22 : 18"></uv-icon>
+						<uv-icon v-if="icon" :name="icon" :custom-style="iconStyle" :size="size === 'large' ? 44 : 36"></uv-icon>
 					</slot>
 				</view>
 				<view class="uv-cell__title">
@@ -32,7 +32,7 @@
 				:class="[`uv-cell__right-icon-wrap--${arrowDirection}`]">
 				<slot name="right-icon">
 					<uv-icon v-if="isLink" :name="rightIcon" :custom-style="rightIconStyle" :color="disabled ? '#c8c9cc' : 'info'"
-						:size="size === 'large' ? 18 : 16"></uv-icon>
+						:size="size === 'large' ? 36 : 32"></uv-icon>
 				</slot>
 			</view>
 		</view>

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/app.json

@@ -27,7 +27,8 @@
     {
       "root": "subPages/shopPage",
       "pages": [
-        "webview/webview"
+        "webview/webview",
+        "payment/payment"
       ]
     },
     {

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/components/common/upload.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "uv-upload": "/uni_modules/uv-upload/components/uv-upload/uv-upload"
-  },
-  "component": true
+  }
 }

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/components/login/imageCode.json

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

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 */ 289))
+      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))
     },
     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 */ 297))
+      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))
     },
     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 */ 305))
+      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))
     },
   }
 } 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 */ 305))
+      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))
     },
     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 */ 297))
+      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))
     },
     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 */ 322))
+      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))
     },
     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 */ 328))
+      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))
     },
     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 */ 336))
+      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))
     },
     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 */ 278))
+      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))
     },
   }
 } catch (e) {
@@ -281,7 +281,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 */ 344));
+    return resolve(__webpack_require__(/*! @/components/login/imageCode.vue */ 360));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

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 */ 289))
+      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))
     },
     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 */ 297))
+      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))
     },
     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 */ 314))
+      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))
     },
   }
 } catch (e) {