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

pages/goods/order/index.vue

@@ -562,17 +562,6 @@ export default {
           } else {
             this.selectPayIndex = 0;
           }
-
-          if (this.actualPayment == 0) {
-            var that = this;
-            this.payList.forEach((e, i) => {
-              if (e.type == 4) {
-                that.selectPayIndex = i;
-                that.payType = 4;
-              }
-            });
-            this.$forceUpdate();
-          }
         } else {
           if (platform == "ios") {
             this.selectPayIndex = 0;
@@ -580,7 +569,18 @@ export default {
             this.selectPayIndex = 0;
           }
         }
+
         this.payType = this.payList[this.selectPayIndex].type;
+        if (this.actualPayment == 0) {
+          var that = this;
+          this.payList.forEach((e, i) => {
+            if (e.type == 4) {
+              that.selectPayIndex = i;
+              that.payType = 4;
+            }
+          });
+          this.$forceUpdate();
+        }
         this.$forceUpdate();
       },
     },
@@ -1406,6 +1406,17 @@ export default {
       }, 5000);
       let xiaBiao = [];
       let data = {};
+
+      if (
+        this.payType == 4 &&
+        this.initData.user.peanutCoin < Number(this.actualPayment)
+      ) {
+        uni.showToast({
+          title: "天医币余额不足",
+          icon: "none",
+        });
+        return;
+      }
       if (this.options.isFudu) {
         data = {
           jfDeduction: this.jfNumber,

pages/mine/vip/index.vue

@@ -21,6 +21,7 @@
 					<view class="vip_qx_v">一年<text class="vip_fee line">{{item.originalPrice||0}}</text>元</view>
 				</view>
 				<view v-if="$platform!='ios'">
+					
 					<text class="vip_item_btn" v-if="item.state==null" @click="openorderModal(item,0)">去办理</text>
 					<text class="vip_item_btn" v-else @click="openorderModal(item,0)">去续费</text>
 				</view>
@@ -141,7 +142,7 @@ export default{
 			
 			this.selectVipData.title = item.title + '-' + item.year + '年';
 			this.selectVipData.lastFee = item.rebateFee;
-			
+			this.selectVipData.state=item.state;
 			this.orderModalShow = true;
 			console.log('-----selectVipData-----',this.selectVipData)
 			this.$nextTick(() => {

pages/mine/wallet/jf/index.vue

@@ -47,8 +47,9 @@
                   ><view class="AC_mark" v-if="slotProps.row.remark">{{
                     slotProps.row.remark
                   }}</view
-                  ><view class="AC_time">{{ slotProps.row.createTime }}</view>
+                  ><view class="AC_time">{{ slotProps.row.createTime }} </view>
                 </view>
+                <text  class="order" style="font-size: 12px;" v-if="slotProps.row.relationId" @click="goClick(slotProps.row.relationId)">订单详情</text>
               </template>
             </common-list>
           </view>
@@ -199,7 +200,7 @@ export default {
   onPageScroll(e) {
     this.scrollTop = e.scrollTop;
   },
-
+ 
   // 下拉刷新
   onReachBottom() {
     this.status = 0;
@@ -247,6 +248,13 @@ export default {
   },
   //方法
   methods: {
+    goClick(id){
+      uni.navigateTo({
+					url: "/pages/bookShop/orderLCont?orderId=" +
+						id
+						
+				});
+},
     // 获取
     getData() {
       var data = {
@@ -370,7 +378,9 @@ export default {
       font-weight: bold;
     }
   }
-
+.order{
+  color: $themeColor;
+}
   .AC_con {
     // background-color: #fff;
     overflow: hidden;