Merge remote-tracking branch 'origin/yijia' into yijia

3 years ago · fdb047b969
--- a/addons/unishop/uniapp/uni-shop/App.vue
+++ b/addons/unishop/uniapp/uni-shop/App.vue
@@ -20,6 +20,9 @@
 				if (!result) {
 					// 若没有登录则清空个人信息
 					this.logout();
 					uni.navigateTo({
 						url: '/pages/public/login'
 					});
 				}
 			},
 			// #endif
--- a/addons/unishop/uniapp/uni-shop/pages/index/index.vue
+++ b/addons/unishop/uniapp/uni-shop/pages/index/index.vue
@@ -257,11 +257,12 @@

 		},
 		onLoad() {
 			this.loadCateList();
 			this.loadData();
 			// this.loadCateList();
 			// this.loadData();
 		},
 		onShow() {
 			// this.loadData();
 			this.loadCateList();
 			this.loadData();
 		},
 		onReachBottom() {
 			this.loadCateList();
--- a/addons/unishop/uniapp/uni-shop/pages/money/pay.vue
+++ b/addons/unishop/uniapp/uni-shop/pages/money/pay.vue
@@ -6,7 +6,7 @@
 		</view>

 		<view class="pay-type-list">
 			<view class="type-item b-b" @click="changePayType(1)" v-if="payTypeList.wxpay && total > 0">
 			<!-- <view class="type-item b-b" @click="changePayType(1)" v-if="payTypeList.wxpay && total > 0">
 				<text class="icon yticon icon-wxpay"></text>
 				<view class="con">
 					<text class="tit">微信支付</text>
@@ -15,7 +15,7 @@
 					<radio value="" color="#fa436a" :checked='payType == 1' />
 					</radio>
 				</label>
 			</view>
 			</view> -->
 			<view class="type-item b-b" @click="changePayType(2)" v-if="payTypeList.alipay && total > 0">
 				<text class="icon yticon icon-alipay"></text>
 				<view class="con">
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/index.html
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/index.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>宜家自购商城</title><script>document.addEventListener('DOMContentLoaded', function() {
 				document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
 			})</script><link rel=stylesheet href=/h5/static/index.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script>/*BAIDU_STAT*/</script><script src=/h5/static/js/chunk-vendors.4d3f7405.js></script><script src=/h5/static/js/index.e360ff1b.js></script></body></html>
 			})</script><link rel=stylesheet href=/h5/static/index.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script>/*BAIDU_STAT*/</script><script src=/h5/static/js/chunk-vendors.4d3f7405.js></script><script src=/h5/static/js/index.28cd31ed.js></script></body></html>
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/index.28cd31ed.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/index.28cd31ed.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/index.e360ff1b.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/index.e360ff1b.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-index-index.3582254a.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-index-index.3582254a.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-index-index.38c071d4.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-index-index.38c071d4.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-money-pay.f17eb823.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-money-pay.f17eb823.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-money-pay.f78cb649.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-money-pay.f78cb649.js