Merge branch 'dev_7.1.0' into fixbug-ZYW

src/app.js

@@ -38,7 +38,6 @@ App({
     
   },
   onShow: function (options = {}) {
-    console.log('app-onshow', options)
     const baseUserInfo = wx.getStorageSync('_baseUserInfo')
     // 获取当前会员是否是体验者
     const { member } = baseUserInfo

src/config/index.js

@@ -4,7 +4,8 @@ const needMock = '' //
 // appid_dev_wx   wxc3b64b09b1d3dfc2
 // appid_test_wx  wx857ea77f4f7f4f34 wxac09792264c49b5c
 // appid_pre_711  wx358b56af62edbde1
-// appid_prod_711  wx700028bf32a3be66 wx313ec36b710125d4---3001 ---
+// appid_prod_711  wx700028bf32a3be66
+// appid_prod_3001 wx313ec36b710125d4
 
 // 1 2 3 4步!!!!!!!!!!!!!!!!!!!!!!  prod appid brandId tunnel-token
 

src/pages/cart/cart.wxml

@@ -2,7 +2,7 @@
 <view class="page-cart" style="padding-bottom:{{currentHeight + 88}}px">
 	<!-- <view class="open-card">
 		<view class="vip-desc">
-			<image class="plus-img" src="/assets/imgs/7_1_0/plus-icon.png" mode="widthFix" />
+			<image class="plus-img" src="/assets/imgs/7_1_0/plus-icon-3x.png" mode="widthFix" />
 			<text class="vip-info">VIP尊享N大权益，本单立减</text>
 			<text class="vip-price">￥145</text>
 		</view>

src/pages/confirmOrder/confirmOrder.js

@@ -405,6 +405,8 @@ wxService.page({
             fail(res) {
               wx.hideLoading()
               //  wxService.router(`/subPackage/page/pages/paymentStatus/paymentStatus?status=F`)
+               wxService.router(`/pages/order/order`)
+              //  wxService.router(`/pages/orderDetail/orderDetail?id=${id}`)
             }
           }, data.wxParams))
         }

src/pages/confirmOrder/confirmOrder.wxml

@@ -89,7 +89,7 @@
 			<view class="vip-info" wx:if="{{!isVip}}">
 				<view class="vip-left">
 					<view class="left-top">
-						<image class="top-image" src="/assets/imgs/7_1_0/plus-icon.png" />
+						<image class="top-image" src="/assets/imgs/7_1_0/plus-icon-3x.png" />
 						<text>现在勾选成为vip，立领200元礼包</text>
 					</view>
 					<view class="left-bottom">
@@ -150,7 +150,7 @@
 						<text class="vip-desc"> （不可使用任何优惠或积分）</text>
 						<view class="select-coupon">
 							<text class="coupon-price">+￥{{plusMemberPrice}}</text>
-							<image class="arrow-right" src="/assets/imgs/7_1_0/arrow-right.png" />
+							<!--<image class="arrow-right" src="/assets/imgs/7_1_0/arrow-right.png" />-->
 						</view>
 					</view>
 				</view>

src/pages/confirmOrder/confirmOrder.wxss

@@ -248,6 +248,7 @@
   font-size: 23rpx;
   text-align: left;
   margin-bottom: 8rpx;
+  vertical-align: middle;
 }
 .left-bottom {
   width: 193rpx;
@@ -257,9 +258,10 @@
   text-align: left;
 }
 .left-top .top-image {
-  width: 23rpx;
-  height: 11rpx;
+  width: 35rpx;
+  height: 20rpx;
   margin-right: 8rpx;
+  vertical-align: middle;
 }
 .left-bottom .bottom-image {
   width: 17rpx;

src/pages/memberOfOwn/memberOfOwn.wxml

@@ -17,7 +17,7 @@
 		</view>
 		<view class='user-qr-code'>
 			<canvas canvas-id="barcode" binderror="canvasIdErrorCallback" />
-			<view class='wx-pay-code' bindtap="onTapWxPay">微信支付</view>
+		<!--	<view class='wx-pay-code' bindtap="onTapWxPay">微信支付</view>-->
 		</view>
 	</view>
 

src/pages/memberOfOwn/memberOfOwn.wxss

@@ -59,7 +59,8 @@ page{
   background-color: #ffffff;
   border-radius: 7rpx;
   display: flex;
-  height: 300rpx;
+  /* height: 300rpx; */
+  height: 200rpx;
   flex-direction: column;
   justify-content: center;
   align-items: center;