Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/ec.uniapp-master

pages/aboutpay/confirmcash.vue

@@ -101,10 +101,10 @@
 				}).then(res => {
 					uni.hideLoading();
 					if(res.data.code == 200){
-						this.$url('/pages/aboutpay/paystate?payState=1&amount='+ this.amount);
+						this.$url('/pages/aboutpay/paystate?payState=1&amount='+ this.amount, {type: 'redirect'});
 					}else{
 						this.$msg(res.data.message || res.data.data || '支付失败').then(() => {
-							this.$url('/pages/aboutpay/paystate?payState=0');
+							this.$url('/pages/aboutpay/paystate?payState=0', {type: 'redirect'});
 						})
 					}
 				}).catch(err => uni.hideLoading())

pages/shop/goodsdetail.vue

@@ -86,6 +86,7 @@
 					</view>
 				</block>
 				<!-- 商品选择规格 -->
+				<block v-if="$isRight(goods_stock.specs)">
 					<view class="bg-white">
 						<view class="cu-bar padding-lr" @click="shoot(2)">
 							<view class="lf-flex">
@@ -98,6 +99,7 @@
 						</view>
 					</view>
 					<self-line></self-line>
+				</block>
 				
 				<!-- 店铺信息 -->
 				<view v-if="type != 'point'">

pages/user/member/code.vue

@@ -199,7 +199,7 @@
 				this.$http.get({
 					api: 'api/offline/get_pay',
 					data: {
-						refresh: this.first_http <= 1 ? 1 : 0
+						cancel: this.first_http <= 1 ? 1 : 0
 					},
 					header: {
 						Authorization: this.token