Merge branch 'master' of https://gitee.com/wjl2008_admin/medicine_app

pages/mine/wallet/index/index.vue

@@ -72,7 +72,8 @@
               <template slot="labelSlot" slot-scope="slotProps">
                 <view class="label_content AC_List">
                   <view class="left">
-                    <view class="title">{{ slotProps.row.orderType }}</view>
+					<view class="title" v-if="slotProps.row.productName">{{ slotProps.row.productName }}</view>
+                    <view class="title" v-else>{{ slotProps.row.orderType }}</view>
                   </view>
                   <view
                     :class="`right ${
@@ -292,7 +293,7 @@ export default {
     if(data.relationId){
         uni.navigateTo({
 					url: "/pages/bookShop/orderLCont?orderId=" +
-						id
+          data.relationId
 						
 				});
     }
@@ -433,26 +434,23 @@ export default {
     .AC_List {
       overflow: hidden;
       .left {
-        width: calc(100% - 220rpx) !important;
+        width: calc(100% - 120rpx) !important;
         font-weight: 700;
         float: left;
         color: #333;
         font-size: 32rpx;
-        line-height: 60rpx;
+        line-height: 44rpx;
       }
       .right {
         display: block;
-        width: 200rpx !important;
+        width: 120rpx !important;
         float: right;
         text-align: right;
         font-size: 32rpx;
         font-weight: 700;
         color: #333;
-      }
-
-      //   border-bottom: 1px solid #eee;
-      //   padding: 40rpx 10rpx;
-
+      } 
+	  
       .AC_title {
         font-size: 32rpx;
         margin-bottom: 20rpx;
@@ -469,14 +467,14 @@ export default {
         font-size: 28rpx;
         margin-top: 20rpx;
         margin-bottom: 15rpx;
-        // white-space: nowrap;
         color: #888;
-        float: left;
+        display: inline-block;
       }
 
       .AC_time {
         color: #bababa;
         font-size: 28rpx;
+		display: inline-block;
       }
     }
   }

pages/mine/wallet/recharge/index.vue

@@ -182,7 +182,11 @@
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
 			this.chargeOrderSn = options.orderSn;
-			// console.log(e.orderSn,'orderSn')
+			if (this.$platform == "ios") {
+			  this.payType = 3;
+			} else {
+			  this.payType = 1;
+			}
 		},
 		//页面显示
 		onShow() {