diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 0d12f45..660fce7 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -24,7 +24,7 @@
             "type" : "uni-app:app-ios"
         },
         {
-            "playground" : "custom",
+            "playground" : "standard",
             "type" : "uni-app:app-android"
         }
     ]
diff --git a/config/baseUrl.js b/config/baseUrl.js
index f259e79..672102e 100644
--- a/config/baseUrl.js
+++ b/config/baseUrl.js
@@ -7,7 +7,7 @@ if (process.env.NODE_ENV === 'development') {
 	// baseUrl = "https://twin-ui.com/demo/";
 	// baseUrl = "https://testapi.nuttyreading.com/";      // 线上测试环境
 	baseUrl = "https://api.nuttyreading.com/"; // 线上正式
-	// baseUrl = "http://192.168.110.100:9200/pb/"; //  开发用电脑
+	// baseUrl = "http://192.168.110.100:9200/pb/"; //  张川川
 	// baseUrl = "http://59.110.212.44:9200/pb/";
 	// baseUrl = "http://192.168.110.100:9100/pb/";    //  开发用电脑
 	// baseUrl = "http://192.168.110.110:9200/pb/";//磊哥
@@ -20,7 +20,7 @@ if (process.env.NODE_ENV === 'development') {
 	// baseUrl = "http://59.110.212.44:9100/pb/";
 	// baseUrl = "https://testapi.nuttyreading.com/";  
 	baseUrl = "https://api.nuttyreading.com/"; //1
-	// baseUrl = "http://192.168.110.100:9200/pb/"; //  开发用电脑
+	// baseUrl = "http://192.168.110.100:9200/pb/"; //  张川川
 	// baseUrl = "ws://twin-ui.com:6001/";
 	// socketUrl = "ws://twin-ui.com:6001/";
 }
diff --git a/manifest.json b/manifest.json
index 950e24a..f6e9ef5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -10,8 +10,8 @@
 		"sizes": "分辨率，192x192",
 		"src": "图片路径"
 	}],
-	"versionName": "1.2.68",
-	"versionCode": 1268,
+	"versionName": "1.2.70",
+	"versionCode": 1270,
 	"app-plus": {
 		"compatible": {
 			"ignoreVersion": true
diff --git a/pages/bookShop/commodityDetail.vue b/pages/bookShop/commodityDetail.vue
index 0a859fb..1ba50f1 100644
--- a/pages/bookShop/commodityDetail.vue
+++ b/pages/bookShop/commodityDetail.vue
@@ -43,27 +43,100 @@
     <view class="commodityContent">
       <view
         class="commodityPrice"
+        style="padding-top: 4px !important"
         v-if="productInfo.activityPrice && productInfo.activityPrice > 0"
-      >
-        <span style="font-size: 28rpx">￥</span
-        ><em>{{ productInfo.activityPrice }}</em>
+        ><span
+          v-if="
+            productInfo.isVipPrice == 1 &&
+            productInfo.vipPrice != 0 &&
+            productInfo.vipPrice != null
+          "
+          style="
+            margin-right: 10px;
+            text-align: center;
+            font-size: 18rpx;
+            background-color: #f94f04;
+            color: #fff;
+            font-weight: bold;
+            border-radius: 4px;
+            width: 120rpx;
+            padding: 2px 4px;
+            box-sizing: border-box;
+          "
+          >VIP优惠图书</span
+        >
+
+        <span style="font-size: 28rpx">￥</span>
+        <em
+          v-if="
+            productInfo.isVipPrice == 1 &&
+            productInfo.vipPrice != 0 &&
+            productInfo.vipPrice != null
+          "
+          >{{ productInfo.vipPrice }}</em
+        >
+        <em v-else>{{ productInfo.activityPrice }}</em>
         <span class="oldPrice"
           >原价<span style="font-size: 20rpx; padding-left: 10rpx">￥</span
           >{{ productInfo.price }}</span
         >
       </view>
-      <view class="commodityPrice" v-else>
-        <span style="font-size: 28rpx">￥</span><em>{{ productInfo.price }}</em>
+
+      <view class="commodityPrice" v-else style="padding-top: 4px !important">
+        <span
+          v-if="
+            productInfo.isVipPrice == 1 &&
+            productInfo.vipPrice != 0 &&
+            productInfo.vipPrice != null
+          "
+          style="
+            margin-right: 10px;
+            text-align: center;
+            font-size: 18rpx;
+            background-color: #f94f04;
+            color: #fff;
+            font-weight: bold;
+            border-radius: 4px;
+            width: 120rpx;
+            padding: 2px 4px;
+            box-sizing: border-box;
+          "
+          >VIP优惠图书</span
+        >
+
+        <template
+          v-if="
+            productInfo.isVipPrice == 1 &&
+            productInfo.vipPrice != 0 &&
+            productInfo.vipPrice != null
+          "
+          ><span style="font-size: 28rpx">￥</span>
+          <em>{{ productInfo.vipPrice }}</em
+          ><span class="oldPrice"
+            >原价<span style="font-size: 20rpx; padding-left: 10rpx">￥</span
+            >{{ productInfo.price }}</span
+          ></template
+        >
+        <template v-else>
+          <span style="font-size: 28rpx">￥</span
+          ><em>{{ productInfo.price }}</em>
+        </template>
       </view>
       <view class="commodityyName">
         {{ productInfo.productName }}
         <span
           v-if="productInfo.productStock == 0"
-          style="color: #aaa; font-size: 26rpx"
+          style="color: #aaa; font-size: 28rpx"
           >（无货）</span
         >
         <view
-          ><text class="SoldNumber"
+          style="
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+          "
+        >
+          <text class="SoldNumber"
             >已售<span style="padding-left: 10rpx">{{
               productInfo.sumSales
             }}</span
@@ -86,7 +159,7 @@
               itemClass="itemCouponClass"
             >
             </common-coupon>
-             </view>
+          </view>
         </view>
       </template>
 
@@ -102,6 +175,7 @@
         <view v-if="linkProducts && linkProducts.length > 0 && linkProducts[0]">
           <view
             class="spbh"
+            style="margin-top: 10px"
             v-for="(item, index) in linkProducts"
             :key="item.id"
           >
@@ -112,13 +186,91 @@
               <view class="spbhimg">
                 <image :src="item.productImages" mode="aspectFit"></image>
               </view>
-              <text class="username nowrap">{{ item.productName }}</text>
-              <text
+              <view>
+                <text class="username">{{ item.productName }} </text>
+                <br />
+                <!-- <text
                 class="price"
                 v-if="item.activityPrice && item.activityPrice > 0"
                 >￥{{ item.activityPrice }}</text
               >
-              <text class="price" v-else>￥{{ item.price }}</text>
+              <text class="price" v-else>￥{{ item.price }}</text> -->
+
+                <text
+                  class="price"
+                  v-if="
+                    item.isVipPrice == 1 &&
+                    item.vipPrice != 0 &&
+                    item.vipPrice != null
+                  "
+                >
+                  <text
+                    style="color: #e97512; font-size: 15px; font-weight: bold"
+                    >￥{{ item.vipPrice.toFixed(2) }}</text
+                  >
+                  <!-- <text style="color: #fa2d12; font-size: 10px; margin-left: 4px"
+                >VIP到手价</text
+              > -->
+                  <text
+                    style="
+                      color: #8a8a8a;
+                      font-size: 14px;
+                      margin-left: 4px;
+                      font-weight: bold;
+                      text-decoration: line-through;
+                    "
+                    >￥{{ Number(item.price).toFixed(2) }}</text
+                  >
+                </text>
+
+                <text
+                  v-else-if="item.activityPrice && item.activityPrice > 0"
+                  class="price"
+                >
+                  <text
+                    style="color: #e97512; font-size: 15px; font-weight: bold"
+                    >￥{{ item.activityPrice.toFixed(2) }}</text
+                  >
+                  <!-- <text style="color: #613804; font-size: 10px; margin-left: 4px"
+                >活动价</text
+              > -->
+                  <text
+                    style="
+                      color: #8a8a8a;
+                      font-size: 14px;
+                      margin-left: 4px;
+                      font-weight: bold;
+                      text-decoration: line-through;
+                    "
+                    >￥{{ Number(item.price).toFixed(2) }}</text
+                  >
+                </text>
+
+                <text
+                  v-else
+                  class="price"
+                  style="color: #e97512; font-size: 15px"
+                  >￥{{ Number(item.price).toFixed(2) }}</text
+                >
+                <text
+                  v-if="
+                    item.isVipPrice == 1 &&
+                    item.vipPrice != 0 &&
+                    item.vipPrice != null
+                  "
+                  style="
+                    z-index: 10;
+
+                    margin-left: 10rpx;
+
+                    font-size: 20rpx;
+                    color: #f94f04;
+
+                    font-weight: bold;
+                  "
+                  >VIP优惠</text
+                >
+              </view>
             </view>
           </view>
         </view>
@@ -396,7 +548,7 @@
       <u-popup :show="upoShow" :round="10" @close="closeUpo" style="z-index: 2">
         <view class="tanchu">
           <view class="list">
-            <view class="imgBox">
+            <view class="imgBox" style="position: relative">
               <image
                 v-if="linkimg == ''"
                 src="../../static/icon/wufeng.jpg"
@@ -430,13 +582,95 @@
                 <view class="spbhimg">
                   <image :src="item.productImages" mode="aspectFit"></image>
                 </view>
-                <text class="username nowrap">{{ item.productName }}</text>
-                <text
+                <view>
+                  <text class="username">{{ item.productName }} </text>
+                  <br />
+                  <!-- <text
                   class="price"
                   v-if="item.activityPrice && item.activityPrice > 0"
                   >￥{{ item.activityPrice }}</text
                 >
-                <text class="price" v-else>￥{{ item.price }}</text>
+                <text class="price" v-else>￥{{ item.price }}</text> -->
+                  <text
+                    class="price"
+                    v-if="
+                      item.isVipPrice == 1 &&
+                      item.vipPrice != 0 &&
+                      item.vipPrice != null
+                    "
+                  >
+                    <text
+                      style="color: #e97512; font-size: 15px; font-weight: bold"
+                      >￥{{ item.vipPrice.toFixed(2) }}</text
+                    >
+                    <!-- <text style="color: #fa2d12; font-size: 10px; margin-left: 4px"
+                >VIP到手价</text
+              > -->
+                    <text
+                      style="
+                        color: #8a8a8a;
+                        font-size: 14px;
+                        margin-left: 4px;
+                        font-weight: bold;
+                        text-decoration: line-through;
+                      "
+                      >￥{{ Number(item.price).toFixed(2) }}</text
+                    >
+                  </text>
+
+                  <text
+                    v-else-if="item.activityPrice && item.activityPrice > 0"
+                    class="price"
+                  >
+                    <text
+                      style="
+                        color: #e97512;
+                        font-size: 15px;
+                        font-weight: bold;
+                      "
+                      >￥{{ item.activityPrice.toFixed(2) }}</text
+                    >
+                    <!-- <text style="color: #613804; font-size: 10px; margin-left: 4px"
+                >活动价</text
+              > -->
+                    <text
+                      style="
+                        color: #8a8a8a;
+                        font-size: 14px;
+                        margin-left: 4px;
+                        font-weight: bold;
+                        text-decoration: line-through;
+                      "
+                      >￥{{ Number(item.price).toFixed(2) }}</text
+                    >
+                  </text>
+
+                  <text
+                    v-else
+                    class="price"
+                    style="color: #e97512; font-size: 15px;"
+                    >￥{{ Number(item.price).toFixed(2) }}</text
+                  >
+
+                  <text
+                    v-if="
+                      item.isVipPrice == 1 &&
+                      item.vipPrice != 0 &&
+                      item.vipPrice != null
+                    "
+                    style="
+                      z-index: 10;
+
+                      margin-left: 10rpx;
+
+                      font-size: 20rpx;
+                      color: #f94f04;
+
+                      font-weight: bold;
+                    "
+                    >VIP优惠</text
+                  >
+                </view>
               </view>
             </view>
           </view>
@@ -476,7 +710,7 @@ import loginVue from "../user/login.vue";
 export default {
   data() {
     return {
-		canGetCouponList:[],
+      canGetCouponList: [],
       qunyiList: [
         {
           name: "打卡",
@@ -583,8 +817,8 @@ export default {
     musicPlay,
   },
   methods: {
-	  // 获取购买后可获得优惠券列表
-	  async getCanGetCouponList() {
+    // 获取购买后可获得优惠券列表
+    async getCanGetCouponList() {
       await this.$http
         .request({
           url: "common/coupon/couponToProductList",
@@ -600,7 +834,7 @@ export default {
           },
         })
         .then(async (res) => {
-          if (res.code != 0) return ;
+          if (res.code != 0) return;
           console.log("res优惠券", res);
           this.canGetCouponList = res.couponToShopproductPage.records;
         })
@@ -1262,6 +1496,7 @@ export default {
   }
 
   .spbh {
+    margin-top: 10px;
     border: 2rpx solid #fff;
 
     .spbhimg {
@@ -1382,7 +1617,7 @@ export default {
 
 .spbh {
   padding-bottom: 10rpx;
-  font-size: 26rpx;
+  font-size: 28rpx;
   padding: 0 10rpx;
 }
 
@@ -1402,7 +1637,8 @@ export default {
 }
 
 .username {
-  margin-left: 10rpx;
+  padding-left: 20rpx;
+  text-align: justify;
 }
 
 .price {
@@ -1432,7 +1668,7 @@ export default {
   }
 
   .username {
-    font-size: 24rpx;
+    font-size: 26rpx;
     color: #999;
     margin-top: 6rpx;
   }
@@ -1474,7 +1710,7 @@ export default {
   // padding: 20px 10px;
   // line-height: 30rpx;
   // background-color: #fff;
-  font-size: 26rpx;
+  font-size: 28rpx;
   color: #555;
   // border-radius: 20rpx 20rpx 0 0
 }
@@ -1500,7 +1736,7 @@ export default {
   background-color: #fff;
   padding: 30rpx 30rpx 10rpx 30rpx;
   height: auto;
-  font-size: 26rpx;
+  font-size: 28rpx;
 
   .commodityPrice {
     // background-image: linear-gradient(0deg, #f7fffc 0%, #def0ea 100%);
@@ -1633,7 +1869,7 @@ export default {
 }
 
 .quanyi_item {
-  font-size: 26rpx;
+  font-size: 28rpx;
   width: auto;
   border-radius: 10rpx;
 
diff --git a/pages/bookShop/orderLCont.vue b/pages/bookShop/orderLCont.vue
index 1f8f1b8..661a71c 100644
--- a/pages/bookShop/orderLCont.vue
+++ b/pages/bookShop/orderLCont.vue
@@ -33,8 +33,11 @@
 					<text class="orderState orderState5" v-if="orderContet.orderStatus==5">已超时</text>
 				</view>	
 							<template v-if="orderContet.orderType == 'order' && orderContet.goodsList.length > 0">
-				<view class="orderContent" v-for="(item,index) in orderContet.goodsList" :key="index"
+				<view style="position: relative;" class="orderContent" v-for="(item,index) in orderContet.goodsList" :key="index"
 					@click="goDetail(item.productId)" >
+					<!-- <span v-if="item.isVipPrice==1&&item.vipPrice!=0&&item.vipPrice!=null"
+									style="position: absolute;z-index: 10;top: 4px;left: 0px;margin-right: 10px;text-align: center;font-size: 18rpx;background-color: #f94f04;color: #fff;font-weight: bold;border-radius:4px;width: 80rpx; padding:2px 4px;box-sizing: border-box;">VIP优惠</span>
+							 -->
 					<image :src="item.productImage" mode=""></image>
 					<view class="itemJian">
 						<view class="orderTitle">
@@ -94,6 +97,15 @@
 					<span style="color: #666;margin-right: 10rpx;float: left;">运费 : </span>
 					<span>￥</span>{{orderContet.shippingPrice}}
 				</view>
+				<view class="orderReal" v-if="orderContet.orderType == 'order'&&orderContet.districtPrice&&orderContet.districtPrice>0">
+					<span style="color: #666;margin-right: 10rpx;float: left;"> 活动立减: </span>
+					<span style="color: #fa2d12">- ￥{{orderContet.districtPrice}}</span>
+				</view>
+				<view class="orderReal" v-if="orderContet.orderType == 'order'&&orderContet.vipDiscountAmount&&orderContet.vipDiscountAmount>0">
+					<span style="color: #666;margin-right: 10rpx;float: left;"> <span style="color: #f94f04;font-weight: bold;margin-right: 2px;">VIP</span>  专享立减: </span>
+					<span style="color: #fa2d12">- ￥{{orderContet.vipDiscountAmount}}</span>
+				</view>
+				
 				<!-- <view class="orderReal">
 					<span style="color: #666;margin-right: 10rpx;float: left;">优惠券 : </span>
 					<b v-if="orderContet.coupon.couponAmount" style="color: #dd3c0c;"><span>-￥</span>{{orderContet.coupon.couponAmount}}</b>
diff --git a/pages/bookShop/orderList.vue b/pages/bookShop/orderList.vue
index bd16b11..df3250f 100644
--- a/pages/bookShop/orderList.vue
+++ b/pages/bookShop/orderList.vue
@@ -32,7 +32,11 @@
                             <view class="orderstatus" v-show="item.orderStatus == 4">交易失败</view>
                             <view class="orderstatus" v-show="item.orderStatus == 5">过期</view>
 							<template v-if="item.orderType == 'order'">
-							<view v-for="(item1,index1) in item.productList" :key="index1" class="bookinfolist">
+							<view style="position: relative;" v-for="(item1,index1) in item.productList" :key="index1" class="bookinfolist">
+<!-- 							
+								<span v-if="item1.product.isVipPrice==1&&item1.product.vipPrice!=0&&item1.vipPrice!=null"
+									style="position: absolute;z-index: 10;top: 4px;left: 0px;margin-right: 10px;text-align: center;font-size: 18rpx;background-color: #f94f04;color: #fff;font-weight: bold;border-radius:4px;width: 80rpx; padding:2px 4px;box-sizing: border-box;">VIP优惠</span>
+							 -->
 								<image class="feng" v-if="item1.product.productImages" :src="item1.product.productImages" mode="aspectFill"></image>
 								<!-- <view class="description" v-html="item.content">
 								</view> -->
@@ -317,6 +321,8 @@ import { data } from 'jquery';
 					"limit": 10,
 					"page": this.newestpage
 				}
+				
+				console.log('params at line 324:', params)
 				$http.request({
 					url: "book/buyOrder/getUserOrderList",
 					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
diff --git a/pages/bookShop/settlement.vue b/pages/bookShop/settlement.vue
index b461b41..cda7bc5 100644
--- a/pages/bookShop/settlement.vue
+++ b/pages/bookShop/settlement.vue
@@ -1,58 +1,149 @@
 <template>
-	<view>
-		<!-- 公共组件-每个页面必须引入 -->
-		<public-module></public-module>
-		<z-nav-bar title="商品结算"></z-nav-bar>
-		<view v-if="adressMoRen.consigneeName==undefined" class="addShouhuo" @click="toAddress()">
-			<u-icon name="plus" size="20" style="display: inline-block;margin-right: 10rpx;"></u-icon>
-			请添加收货地址
-		</view>
-		<view class="adDefault" @click="dizhiShow = true" v-if="adressMoRen.consigneeName!=undefined">
-			<view class="defalTop">
-				<text class="userName">
-					{{adressMoRen.consigneeName}}
-				</text>
-				<text class="userTel">
-					{{adressMoRen.consigneePhone}}
-				</text>
-				<text class="userMoren" v-if="adressMoRen.isDefault==1">
-					默认
-				</text>
-			</view>
-			<view class="defalBottom">
-				<text class="userAddress">
-					{{adressMoRen.province}} {{adressMoRen.city}} {{adressMoRen.county}} {{adressMoRen.detailAddress}}
-				</text>
-			</view>
+  <view>
+    <!-- 公共组件-每个页面必须引入 -->
+    <public-module></public-module>
+    <z-nav-bar title="商品结算"></z-nav-bar>
+    <view
+      v-if="adressMoRen.consigneeName == undefined"
+      class="addShouhuo"
+      @click="toAddress()"
+    >
+      <u-icon
+        name="plus"
+        size="20"
+        style="display: inline-block; margin-right: 10rpx"
+      ></u-icon>
+      请添加收货地址
+    </view>
 
-			<u-icon name="map" color="#aaa" size="25" class="defalLeft"></u-icon>
-			<u-icon name="arrow-right" color="#aaa" size="22" class="defalRight"></u-icon>
-		</view>
+    <view
+      class="adDefault"
+      @click="dizhiShow = true"
+      v-if="adressMoRen.consigneeName != undefined"
+    >
+      <view class="defalTop">
+        <text class="userName">
+          {{ adressMoRen.consigneeName }}
+        </text>
+        <text class="userTel">
+          {{ adressMoRen.consigneePhone }}
+        </text>
+        <text class="userMoren" v-if="adressMoRen.isDefault == 1"> 默认 </text>
+      </view>
+      <view class="defalBottom">
+        <text class="userAddress">
+          {{ adressMoRen.province }} {{ adressMoRen.city }}
+          {{ adressMoRen.county }} {{ adressMoRen.detailAddress }}
+        </text>
+      </view>
 
-		<view class="cartItem" v-for="(item,index) in cartList" :key="index">
-			<view class="cartContent">
-				<image :src="item.image" mode=""></image>
-				<view class="itemCenter">
-					<view class="cartTitle">
-						<text>{{item.productName}}</text>
-					</view>
-					<view class="itemPrice">
-						<text
-							v-if="item.activityPrice && item.activityPrice > 0">￥{{item.activityPrice*item.productAmount}}</text>
-						<text v-else>￥{{item.price*item.productAmount}}</text>
-						<u-number-box v-model="item.productAmount" @change="valChange($event, item)" :input-width="50"
-							:input-height="20" :min="1" :max="item.productStock" integer></u-number-box>
-					</view>
-				</view>
-			</view>
-		</view>
+      <u-icon name="map" color="#aaa" size="25" class="defalLeft"></u-icon>
+      <u-icon
+        name="arrow-right"
+        color="#aaa"
+        size="22"
+        class="defalRight"
+      ></u-icon>
+    </view>
 
-		<view class="youhui_quan">
-			<view class="yq_alljia">
-				商品总价
-				<text>￥{{totalPrice}}</text>
-			</view>
-			<!-- <view class="yq_youhui" @click="youhuiShow = true">
+    <view class="cartItem" v-for="(item, index) in cartList" :key="index">
+      <view class="cartContent" style="position: relative">
+        <span
+          v-if="
+            item.isVipPrice == 1 && item.vipPrice != 0 && item.vipPrice != null
+          "
+          style="
+            position: absolute;
+            z-index: 10;
+            top: 4px;
+            left: 0px;
+            margin-right: 10px;
+            text-align: center;
+            font-size: 18rpx;
+            background-color: #f94f04;
+            color: #fff;
+            font-weight: bold;
+            border-radius: 4px;
+            width: 80rpx;
+            padding: 2px 4px;
+            box-sizing: border-box;
+          "
+          >VIP优惠</span
+        >
+
+        <image :src="item.image" mode=""></image>
+        <view class="itemCenter">
+          <view class="cartTitle">
+            <text>{{ item.productName }}</text>
+          </view>
+          <view class="itemPrice">
+            <text
+              v-if="
+                item.isVipPrice == 1 &&
+                item.vipPrice != 0 &&
+                item.vipPrice != null
+              "
+            >
+              <text style="color: #e97512; font-size: 30rpx; font-weight: bold"
+                >￥{{ item.vipPrice.toFixed(2) }}</text
+              >
+              <!-- <text style="color: #fa2d12; font-size:28rpx; margin-left: 4px"
+                >VIP到手价</text
+              > -->
+              <text
+                style="
+                  color: #8a8a8a;
+                  font-size: 28rpx;
+                  margin-left: 4px;
+                  font-weight: bold;
+                  text-decoration: line-through;
+                "
+                >￥{{  Number(item.price).toFixed(2) }}</text
+              >
+            </text>
+
+            <text v-else-if="item.activityPrice && item.activityPrice > 0">
+              <text style="color: #e97512; font-size: 30rpx; font-weight: bold"
+                >￥{{ item.activityPrice.toFixed(2) }}</text
+              >
+              <!-- <text style="color: #613804; font-size: 28rpx; margin-left: 4px"
+                >活动价</text
+              > -->
+              <text
+                style="
+                  color: #8a8a8a;
+                  font-size: 28rpx;
+                  margin-left: 4px;
+                  font-weight: bold;
+                  text-decoration: line-through;
+                "
+                >￥{{  Number(item.price).toFixed(2) }}</text
+              >
+            </text>
+
+            <text v-else style="color: #e97512; font-size: 30rpx; font-weight: bold">￥{{  Number(item.price).toFixed(2) }}</text>
+
+            <u-number-box
+              button-size="20"
+              v-model="item.productAmount"
+              @change="valChange($event, item)"
+              :input-width="25"
+              :input-height="10"
+              :min="1"
+              :max="item.productStock"
+              integer
+            ></u-number-box>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <view class="youhui_quan">
+      <view class="yq_alljia" style="color: #202020">
+        商品总价
+        <text style="color: #202020">￥{{ totalPrice.toFixed(2) }}</text>
+      </view>
+      <!-- <view class="yq_youhui" @click="youhuiShow = true">
 				<u-icon name="red-packet-fill" color="#e74141" size="18" class="yqLeft"></u-icon>
 				优惠券
 				<u-icon name="arrow-right" color="#aaa" size="18" class="yqRight"></u-icon>
@@ -61,37 +152,70 @@
 				<text class="dagnqian" v-if="youhuiContent.id!=undefined">
 					- ￥{{youhuiContent.coupons.couponAmount}}</text>
 			</view> -->
-			<view class="yq_yunfei">
-				<u-icon name="car-fill" color="#e0880c" size="18" class="yqLeft"></u-icon>
-				运费
-				<text>￥{{farePrice}}</text>
-			</view>
-			<view class="yq_beizhu">
-				<u-icon name="info-circle" color="#ffb529" size="12" style="display: inline-block;margin-right: 10rpx;"></u-icon>
-				注：如订单包含一种或多种预售书，预售书和现货书需分开发货（即需要收取多次快递首重费用）；如多本书会按照实际重量，收取快递续重费用。
-			</view>
-		</view>
-		<!-- 支付列表 -->
-		<view class="zhif_fangsh" >
-			<view class="zhif_radio">
-				<u-radio-group v-model="payType">
-					<view style="width: 100%;">
-						<view v-for="(item, index) in paylist" class="zhif_xuanx">
-								<image :src="item.img"></image>
-								{{item.title}}
-								<span v-if="item.id == 4"
-									style="color: #bbb; margin-left: 10px;">{{userMes.peanutCoin}}天医币可用</span>
-								<span @click.stop="buPoint" style="color: #bf0c0c; margin-left: 10px;" v-if="item.id == 4 && oprateOs != 'ios'"
-									class="chongBtn">去充值</span>
-								<u-radio :key="index" activeColor="#fe6e09" :name='item.id'
-									style="float: right;margin-top: 5rpx;"></u-radio>
-						</view>
-					</view>
-				</u-radio-group>
-			</view>
-		</view>
-		<!-- ios支付列表 -->
-		<!-- <view class="zhif_fangsh" v-else>
+
+      <view class="yq_yunfei" style="color: #202020">
+        <u-icon
+          name="car-fill"
+          color="#e0880c"
+          size="18"
+          class="yqLeft"
+        ></u-icon>
+        运费
+        <text style="color: #202020">￥{{ farePrice.toFixed(2) }}</text>
+      </view>
+
+      <view class="yq_beizhu">
+        <u-icon
+          name="info-circle"
+          color="#ffb529"
+          size="12"
+          style="display: inline-block; margin-right: 10rpx"
+        ></u-icon>
+        注：如订单包含一种或多种预售书，预售书和现货书需分开发货（即需要收取多次快递首重费用）；如多本书会按照实际重量，收取快递续重费用。
+      </view>
+
+      <view class="yq_yunfei" v-if="districtAmount > 0" style="color: #202020">
+        <!-- <u-icon name="car-fill" color="#e0880c" size="18" class="yqLeft"></u-icon> -->
+        活动立减
+        <text style="color: #fa2d12">- ￥{{ districtAmount.toFixed(2) }}</text>
+      </view>
+      <view class="yq_yunfei" v-if="vipPrice > 0" style="color: #202020">
+        <!-- <u-icon name="car-fill" color="#e0880c" size="18" class="yqLeft"></u-icon> -->
+       <span style="color: #f94f04;font-weight: bold;margin-right: 2px;">VIP</span>  专享立减
+        <text style="color: #fa2d12">- ￥{{ vipPrice.toFixed(2) }}</text>
+      </view>
+    </view>
+    <!-- 支付列表 -->
+    <view class="zhif_fangsh">
+      <view class="zhif_radio">
+        <u-radio-group v-model="payType">
+          <view style="width: 100%">
+            <view v-for="(item, index) in paylist" class="zhif_xuanx">
+              <image :src="item.img"></image>
+              {{ item.title }}
+              <span v-if="item.id == 4" style="color: #bbb; margin-left: 10px"
+                >{{ userMes.peanutCoin }}天医币可用</span
+              >
+              <span
+                @click.stop="buPoint"
+                style="color: #bf0c0c; margin-left: 10px"
+                v-if="item.id == 4 && oprateOs != 'ios'"
+                class="chongBtn"
+                >去充值</span
+              >
+              <u-radio
+                :key="index"
+                activeColor="#fe6e09"
+                :name="item.id"
+                style="float: right; margin-top: 5rpx"
+              ></u-radio>
+            </view>
+          </view>
+        </u-radio-group>
+      </view>
+    </view>
+    <!-- ios支付列表 -->
+    <!-- <view class="zhif_fangsh" v-else>
 			<view class="zhif_radio">
 				<u-radio-group v-model="payType">
 					<view style="width: 100%;">
@@ -110,988 +234,1172 @@
 			</view>
 		</view> -->
 
-		<view class="footer">
-			<view class="commodityPrice" v-if="payType != 4">
-				<span style="color: #666;margin-right: 10rpx; font-size: 15px;">实付款: </span>
-				<span>￥</span>{{realPrice}}
-			</view>
-			<view class="commodityPrice" v-if="payType == 4">
-				<span style="color: #666;margin-right: 10rpx; font-size: 15px;">实付款: </span>
-				{{realPrice}}<span>天医币</span>
-			</view>
-			<view class="operate" @click="goBuyJie" v-if="payType != 4">
-				<view class="goBuy">
-					立即支付
-				</view>
-			</view>
-			<view class="operate" @click="goPoinBuy" v-if="payType == 4">
-				<view class="goBuy">
-					立即支付
-				</view>
-			</view>
-		</view>
-		<!-- 地址弹出 -->
-		<u-popup :show="dizhiShow" :round="10" @close="dizhiShow=false">
-			<view class="tanchu">
-				<view class="dp_title">请选择地址</view>
-				<view class="dp_add" @click="toAddress()">
-					<u-icon name="plus" color="#fff" size="12"></u-icon>
-					添加地址
-				</view>
-				<view style="max-height: 1000rpx;overflow-y: scroll;">
-					<view :class="adressMoRIndex == index ? 'addressItem addItem_style' : 'addressItem'"
-						v-for="(item,index) in addressList" :key="index" @click="choseDizhi(index)">
-						<view class="addrContent">
-							<view class="addrContentTop">
-								<view class="userName">
-									{{item.consigneeName}}
-								</view>
-								<view class="userTel">
-									{{item.consigneePhone}}
-								</view>
-								<view class="userMoren" v-if="item.isDefault==1">
-									默认
-								</view>
-								<u-icon name="checkmark-circle-fill" class="chooseCheck" size="20" color="#fd6004"
-									v-if="adressMoRIndex == index"></u-icon>
-							</view>
-							<view class="addrContentBottom">
-								<view class="userAddress">
-									{{item.province}} {{item.city}} {{item.county}}
-									{{item.detailAddress}}
-								</view>
-							</view>
-						</view>
-					</view>
+    <view class="footer">
+      <view class="commodityPrice" v-if="payType != 4">
+        <span style="color: #666; margin-right: 10rpx; font-size: 15px"
+          >实付款:
+        </span>
+        <span>￥</span>{{ realPrice.toFixed(2) }}
+      </view>
+      <view class="commodityPrice" v-if="payType == 4">
+        <span style="color: #666; margin-right: 10rpx; font-size: 15px"
+          >实付款:
+        </span>
+        {{ realPrice }}<span>天医币</span>
+      </view>
+      <view class="operate" @click="goBuyJie" v-if="payType != 4">
+        <view class="goBuy"> 立即支付 </view>
+      </view>
+      <view class="operate" @click="goPoinBuy" v-if="payType == 4">
+        <view class="goBuy"> 立即支付 </view>
+      </view>
+    </view>
+    <!-- 地址弹出 -->
+    <u-popup :show="dizhiShow" :round="10" @close="dizhiShow = false">
+      <view class="tanchu">
+        <view class="dp_title">请选择地址</view>
+        <view class="dp_add" @click="toAddress()">
+          <u-icon name="plus" color="#fff" size="12"></u-icon>
+          添加地址
+        </view>
+        <view style="max-height: 1000rpx; overflow-y: scroll">
+          <view
+            :class="
+              adressMoRIndex == index
+                ? 'addressItem addItem_style'
+                : 'addressItem'
+            "
+            v-for="(item, index) in addressList"
+            :key="index"
+            @click="choseDizhi(index)"
+          >
+            <view class="addrContent">
+              <view class="addrContentTop">
+                <view class="userName">
+                  {{ item.consigneeName }}
+                </view>
+                <view class="userTel">
+                  {{ item.consigneePhone }}
+                </view>
+                <view class="userMoren" v-if="item.isDefault == 1"> 默认 </view>
+                <u-icon
+                  name="checkmark-circle-fill"
+                  class="chooseCheck"
+                  size="20"
+                  color="#fd6004"
+                  v-if="adressMoRIndex == index"
+                ></u-icon>
+              </view>
+              <view class="addrContentBottom">
+                <view class="userAddress">
+                  {{ item.province }} {{ item.city }} {{ item.county }}
+                  {{ item.detailAddress }}
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </u-popup>
 
-				</view>
-			</view>
-		</u-popup>
+    <!-- 优惠券弹出 -->
+    <u-popup :show="youhuiShow" :round="10" @close="youhuiShow = false">
+      <view class="tanchu">
+        <view class="dp_title">请选择优惠券</view>
+        <view
+          style="max-height: 1000rpx; overflow-y: scroll"
+          v-if="youhuiList.length > 0"
+        >
+          <view
+            :class="
+              youhuiIndex === index ? 'youhuiItem youItem_style' : 'youhuiItem'
+            "
+            v-for="(item, index) in youhuiList"
+            :key="index"
+            @click="choseYouhui(index)"
+          >
+            <view style="width: 25%; color: #fd6004; text-align: center">
+              <text>￥</text>
+              <b style="font-size: 45rpx">{{ item.coupons.couponAmount }}</b>
+              <text
+                style="
+                  display: block;
+                  color: #666;
+                  font-size: 25rpx;
+                  margin-top: 10rpx;
+                "
+                >满{{ item.coupons.useLevel }}元可用</text
+              >
+            </view>
+            <view style="width: 68%; padding-left: 5%">
+              <text>{{ item.coupons.couponName }}</text>
+              <text
+                style="
+                  display: block;
+                  font-size: 20rpx;
+                  color: #999;
+                  margin-top: 10rpx;
+                "
+                >到期时间：{{ item.coupons.expirationDate }}</text
+              >
+            </view>
+            <view style="width: 7%">
+              <text
+                style="
+                  border: 1px solid #d9d9d9;
+                  width: 35rpx;
+                  height: 35rpx;
+                  display: inline-block;
+                  border-radius: 30rpx;
+                "
+                v-if="youhuiIndex !== index"
+              ></text>
+              <u-icon
+                name="checkmark-circle-fill"
+                color="#fd6004"
+                size="20"
+                v-if="youhuiIndex === index"
+              >
+              </u-icon>
+            </view>
+            <br clear="both" />
+          </view>
+          <view style="font-size: 20rpx; color: #aaa; margin-top: 30rpx"
+            >* 每笔订单只能使用一张优惠价</view
+          >
+        </view>
+        <view class="" v-else>
+          <u-divider text="暂无可用优惠券哦"></u-divider>
+        </view>
+      </view>
+    </u-popup>
 
-
-		<!-- 优惠券弹出 -->
-		<u-popup :show="youhuiShow" :round="10" @close="youhuiShow=false">
-			<view class="tanchu">
-				<view class="dp_title">请选择优惠券</view>
-				<view style="max-height: 1000rpx;overflow-y: scroll;" v-if="youhuiList.length > 0">
-					<view :class="youhuiIndex === index ? 'youhuiItem youItem_style' : 'youhuiItem'"
-						v-for="(item,index) in youhuiList" :key="index" @click="choseYouhui(index)">
-						<view style="width: 25%;color:#fd6004;text-align: center;">
-							<text>￥</text>
-							<b style="font-size: 45rpx;">{{item.coupons.couponAmount}}</b>
-							<text
-								style="display: block;color: #666;font-size: 25rpx;margin-top: 10rpx;">满{{item.coupons.useLevel}}元可用</text>
-						</view>
-						<view style="width: 68%;padding-left: 5%;">
-							<text>{{item.coupons.couponName}}</text>
-							<text
-								style="display: block;font-size: 20rpx;color: #999;margin-top: 10rpx;">到期时间：{{item.coupons.expirationDate}}</text>
-						</view>
-						<view style="width: 7%;">
-							<text
-								style="border: 1px solid #d9d9d9;width: 35rpx;height:35rpx;display:inline-block;border-radius: 30rpx;"
-								v-if="youhuiIndex !== index"></text>
-							<u-icon name="checkmark-circle-fill" color="#fd6004" size="20" v-if="youhuiIndex === index">
-							</u-icon>
-						</view>
-						<br clear="both">
-					</view>
-					<view style="font-size: 20rpx;color: #aaa;margin-top: 30rpx;">* 每笔订单只能使用一张优惠价</view>
-				</view>
-				<view class="" v-else>
-					<u-divider text="暂无可用优惠券哦"></u-divider>
-				</view>
-			</view>
-		</u-popup>
-
-		<music-play :playData="playData"></music-play>
-	</view>
+    <music-play :playData="playData"></music-play>
+  </view>
 </template>
 
 <script>
-	import musicPlay from '@/components/music.vue'
-	import $http from '@/config/requestConfig.js';
-	import {
-		setPay,
-		setPayAssign,
-		setWXPay
-	} from '@/config/utils';
-	import {
-		mapState
-	} from 'vuex';
-	export default {
-		data() {
-			return {
-				isAndorid: true, // 操作系统
-				playData: {},
-				typeId: 0,
-				shangIDNum: 0,
-				cartIDNum: [],
-				cartList: [],
-				userMes: {}, // 用户信息
-				amount: null, // 商品总价
-				addressList: [],
-				adressMoRen: {},
-				adressMoRenPath: "",
-				adressMoRIndex: 0,
-				youhuiList: [],
-				addressId: null,
-				youhuiContent: {},
-				youhuiIndex: '',
-				dizhiShow: false,
-				youhuiShow: false,
-				totalPrice: 0,
-				isSend: '0',
-				farePrice: 0,
-				realPrice: 0,
-				payType:1,
-				nowClick: true,
-				paylist: [{
-						title: '支付宝',
-						id: 2,
-						img: '../../static/icon/pay_1.png'
-					},
-					{
-						title: '微信',
-						id: 1,
-						img: '../../static/icon/pay_2.png'
-					},
-					{
-						title: '天医币购买',
-						id: 4,
-						img: '../../static/icon/oder_chong.png'
-					},
-					// {
-					// 	title: 'ios内购',
-					// 	id: 3,
-					// 	img: '../../static/icon/pay_2.png'
-					// }
-				],
-				paylistIos: [
-					// {
-					// 	title: '支付宝',
-					// 	id: 2,
-					// 	img: '../../static/icon/pay_1.png'
-					// },
-					// {
-					// 	title: '微信',
-					// 	id: 1,
-					// 	img: '../../static/icon/pay_2.png'
-					// },
-					{
-						title: '天医币购买',
-						id: 4,
-						img: '../../static/icon/oder_chong.png'
-					}					
-				],
-				oprateOs : ''
-			}
-		},
-		onLoad(e) {
-			if (e.type == 1) {
-				this.typeId = 1
-				this.cartIDNum = JSON.parse(e.list);
-			} else if (e.type == 2) {
-				this.typeId = 0
-				this.shangIDNum = e.list
-			}
-			//	this.getYunFei()
-			this.getData()
-			this.getOS()
-		},
-		onShow() {
-			// if (this.typeId == 1) {
-			// 	this.getCartList()
+import musicPlay from "@/components/music.vue";
+import $http from "@/config/requestConfig.js";
+import { setPay, setPayAssign, setWXPay } from "@/config/utils";
+import { mapState } from "vuex";
+export default {
+  data() {
+    return {
+      isAndorid: true, // 操作系统
+      playData: {},
+      typeId: 0,
+      shangIDNum: 0,
+      cartIDNum: [],
+      cartList: [],
+      userMes: {}, // 用户信息
+      amount: null, // 商品总价
+      addressList: [],
+      adressMoRen: {},
+      adressMoRenPath: "",
+      adressMoRIndex: 0,
+      youhuiList: [],
+      addressId: null,
+      youhuiContent: {},
+      youhuiIndex: "",
+      dizhiShow: false,
+      youhuiShow: false,
+      totalPrice: 0,
+      isSend: "0",
+      farePrice: 0,
+      vipPrice: 0,
+      districtAmount: 0,
 
-			// } else if (this.typeId == 0) {
-			// 	this.getShangList(this.shangIDNum);				
-			// }			
-			if (this.typeId == 1) {
-				this.getCartList()
+      realPrice: 0,
+      payType: 1,
+      nowClick: true,
+      paylist: [
+        {
+          title: "支付宝",
+          id: 2,
+          img: "../../static/icon/pay_1.png",
+        },
+        {
+          title: "微信",
+          id: 1,
+          img: "../../static/icon/pay_2.png",
+        },
+        {
+          title: "天医币购买",
+          id: 4,
+          img: "../../static/icon/oder_chong.png",
+        },
+        // {
+        // 	title: 'ios内购',
+        // 	id: 3,
+        // 	img: '../../static/icon/pay_2.png'
+        // }
+      ],
+      paylistIos: [
+        // {
+        // 	title: '支付宝',
+        // 	id: 2,
+        // 	img: '../../static/icon/pay_1.png'
+        // },
+        // {
+        // 	title: '微信',
+        // 	id: 1,
+        // 	img: '../../static/icon/pay_2.png'
+        // },
+        {
+          title: "天医币购买",
+          id: 4,
+          img: "../../static/icon/oder_chong.png",
+        },
+      ],
+      oprateOs: "",
+    };
+  },
+  onLoad(e) {
+    if (e.type == 1) {
+      this.typeId = 1;
+      this.cartIDNum = JSON.parse(e.list);
+      console.log("this.cartIDNum at line 326:", this.cartIDNum);
+    } else if (e.type == 2) {
+      this.typeId = 0;
+      this.shangIDNum = e.list;
+    }
+    //	this.getYunFei()
+    this.getData();
+    this.getOS();
+  },
+  onShow() {
+    // if (this.typeId == 1) {
+    // 	this.getCartList()
 
-			} else if (this.typeId == 0) {
-				this.getShangList(this.shangIDNum);
-			}			
-			// this.getUserAddress()
-		},
-		computed: {
-			...mapState(['userInfo']),			
-		},
-		components: {
-			musicPlay
-		},
-		methods: {
-			// 获得操作系统
-			getOS() {
-				// let oprateOs = ''
-				this.oprateOs = uni.getSystemInfoSync().platform
-				// console.log(oprateOs)				
-			},
-			// 充值天医币
-			buPoint() {
-				uni.navigateTo({
-					url: '../peanut/reCharge'
-				});
-			},
-			getData() {
-				let that = this
-				// 获取个人信息
-				// 用户详情
-				if (this.userInfo.id != undefined) {
-					this.$http
-						.post('book/user/info/' + this.userInfo.id)
-						.then(res => {
-							this.userMes = res.user
-							// consol.log(this.userMes.peanutCoin,'呼呼')
-							if (this.userMes.vip != 0) {
-								this.typeFen = 2
-							}
-						});
-				}
-			},
-			// 获取地址列表
-			getUserAddress() {
-				this.$http
-					// .post(`book/useraddress/getUserAddress?userId=${this.userInfo.id}`)					
-					.post(`book/userAddress/getUserAddress?userId=${this.userInfo.id}`)
-					.then(res => {
-						if (res.code == 0) {
-							if (res.list.length != 0) {
-								this.addressList = res.list
-								// console.log(this.addressList,'地址列表')
-								this.adressMoRen = this.addressList[this.adressMoRIndex]
-								console.log(this.adressMoRen, '默认')
-								if (this.adressMoRen != {} && this.adressMoRen.id) {
-									// console.log('运费之前')
-									this.getYunFei()
-								} else {
-									// this.getUserAddress()
-									uni.showToast({
-										title: '获取用户地址失败',
-										icon: 'none'
-									})
-								}
-							}
-						}
-					})
-			},
-			goPoinBuy() {
-				if (this.realPrice > this.userMes.peanutCoin) {
-					uni.showToast({
-						title: '天医币不足，请充值',
-						icon: 'none',
-						duration: 2000
-					})
-					return
-				} else {
-					this.goBuyJie()
-				}
-			},
-			// 获取优惠券列表
-			getCourpe() {
-				let proId = ''
-				for (let i = 0; i < this.cartList.length; i++) {
-					if (i == this.cartList.length - 1) {
-						proId = proId + this.cartList[i].productId
-					} else {
-						proId = proId + this.cartList[i].productId + ','
-					}
-				}
-				let allprice = 0;
-				this.cartList.forEach((item, index) => {
-					let price = 0;
-					price = item.productAmount * item.price;
-					allprice += price
-				})
-				this.amount = allprice // 商品总价
-				this.allPrice()
-				// '&products=' + proId +    //商品id
-				this.$http
-					.post('book/couponhistory/appGetUserCoupon?userId=' + this.userInfo.id + '&amount=' + this.amount +
-						'&type=0')
-					.then(res => {
-						this.youhuiList = res.userCoupons
-					}).catch( e => {
-						console.log('获取优惠券报错',);
-					});
-			},
+    // } else if (this.typeId == 0) {
+    // 	this.getShangList(this.shangIDNum);
+    // }
+    if (this.typeId == 1) {
+      this.getCartList();
+    } else if (this.typeId == 0) {
+      this.getShangList(this.shangIDNum);
+    }
+    // this.getUserAddress()
+  },
+  computed: {
+    ...mapState(["userInfo"]),
+  },
+  components: {
+    musicPlay,
+  },
+  methods: {
+    // 获得操作系统
+    getOS() {
+      // let oprateOs = ''
+      this.oprateOs = uni.getSystemInfoSync().platform;
+      // console.log(oprateOs)
+    },
+    // 充值天医币
+    buPoint() {
+      uni.navigateTo({
+        url: "../peanut/reCharge",
+      });
+    },
+    getData() {
+      let that = this;
+      // 获取个人信息
+      // 用户详情
+      if (this.userInfo.id != undefined) {
+        this.$http.post("book/user/info/" + this.userInfo.id).then((res) => {
+          this.userMes = res.user;
+          // consol.log(this.userMes.peanutCoin,'呼呼')
+          if (this.userMes.vip != 0) {
+            this.typeFen = 2;
+          }
+        });
+      }
+    },
+    // 获取地址列表
+    getUserAddress() {
+      this.$http
+        // .post(`book/useraddress/getUserAddress?userId=${this.userInfo.id}`)
+        .post(`book/userAddress/getUserAddress?userId=${this.userInfo.id}`)
+        .then((res) => {
+          if (res.code == 0) {
+            if (res.list.length != 0) {
+              this.addressList = res.list;
+              // console.log(this.addressList,'地址列表')
+              this.adressMoRen = this.addressList[this.adressMoRIndex];
+              console.log(this.adressMoRen, "默认");
+              if (this.adressMoRen != {} && this.adressMoRen.id) {
+                // console.log('运费之前')
+                this.getYunFei();
+                this.getVipFei();
+                this.getDistrictAmount();
+              } else {
+                // this.getUserAddress()
+                uni.showToast({
+                  title: "获取用户地址失败",
+                  icon: "none",
+                });
+              }
+            }
+          }
+        });
+    },
+    goPoinBuy() {
+      if (this.realPrice > this.userMes.peanutCoin) {
+        uni.showToast({
+          title: "天医币不足，请充值",
+          icon: "none",
+          duration: 2000,
+        });
+        return;
+      } else {
+        this.goBuyJie();
+      }
+    },
+    // 获取优惠券列表
+    getCourpe() {
+      let proId = "";
+      for (let i = 0; i < this.cartList.length; i++) {
+        if (i == this.cartList.length - 1) {
+          proId = proId + this.cartList[i].productId;
+        } else {
+          proId = proId + this.cartList[i].productId + ",";
+        }
+      }
+      let allprice = 0;
+      this.cartList.forEach((item, index) => {
+        let price = 0;
+        price = item.productAmount * item.price;
+        allprice += price;
+      });
+      this.amount = allprice; // 商品总价
+      this.allPrice();
+      // '&products=' + proId +    //商品id
+      this.$http
+        .post(
+          "book/couponhistory/appGetUserCoupon?userId=" +
+            this.userInfo.id +
+            "&amount=" +
+            this.amount +
+            "&type=0"
+        )
+        .then((res) => {
+          this.youhuiList = res.userCoupons;
+        })
+        .catch((e) => {
+          console.log("获取优惠券报错");
+        });
+    },
 
-			// 获取商品详情
-			getShangList(e) {
-				this.cartList = []
-				this.$http
-					.post('book/shopproduct/info/' + e)
-					.then(res => {
-						console.log(res)
-						let prodCont = {}
-						prodCont.productId = res.shopProduct.productId
-						prodCont.image = res.shopProduct.productImages
-						prodCont.productName = res.shopProduct.productName
-						prodCont.productAmount = 1
-						if (res.shopProduct.activityPrice && res.shopProduct.activityPrice > 0) {
-							prodCont.price = res.shopProduct.activityPrice
-						} else {
-							prodCont.price = res.shopProduct.price
-						}
-						prodCont.weight = res.shopProduct.weight
-						this.cartList.push(prodCont)
-						// this.getCourpe()
-						this.getUserAddress()
-						//this.getYunFei()
-						// this.getYunFei()
-					})
-			},
+    // 获取商品详情
+    getShangList(e) {
+      this.cartList = [];
+      this.$http.post("book/shopproduct/info/" + e).then((res) => {
+        console.log(res);
+        console.log("res at line 这是所有商品:", res);
+        let prodCont = {};
+        prodCont.productId = res.shopProduct.productId;
+        prodCont.image = res.shopProduct.productImages;
+        prodCont.productName = res.shopProduct.productName;
+        prodCont.activityPrice = res.shopProduct.activityPrice;
+        prodCont.productAmount = 1;
+        prodCont.isVipPrice = res.shopProduct.isVipPrice;
+        prodCont.vipPrice = res.shopProduct.vipPrice;
+        console.log("prodCont.vipPrice at line 453:", prodCont.vipPrice);
+        // if (prodCont.isVipPrice == 1 && prodCont.vipPrice != 0) {
+        //   prodCont.price = res.shopProduct.price;
+        //   console.log("prodCont.price at line 455:", prodCont.price);
+        // } else {
+        //   if (
+        //     res.shopProduct.activityPrice &&
+        //     res.shopProduct.activityPrice > 0
+        //   ) {
+        //     prodCont.price = res.shopProduct.activityPrice;
+        //   } else {
+        //     prodCont.price = res.shopProduct.price;
 
-			// 获取购物车列表
-			getCartList() {
-				this.cartList = []
-				this.$http
-					.post(`book/ordercart/getCartList?userId=${this.userInfo.id}`)
-					.then(res => {
-						for (let i = 0; i < this.cartIDNum.length; i++) {
-							this.cartList.push(res.cartList[this.cartIDNum[i]])
-						}
-						console.log(this.cartList, '购物车列表')
-						// this.getCourpe()
-						this.getUserAddress()
+        //   }
+        // }
+        prodCont.price = res.shopProduct.price;
+        prodCont.weight = res.shopProduct.weight;
+        this.cartList.push(prodCont);
+        // this.getCourpe()
+        this.getUserAddress();
+        //this.getYunFei()
+        // this.getYunFei()
+      });
+    },
 
-					})
-			},
-			// 获取运费
-			getYunFei() {
-				let key = []
-				let dataToString = ''
-				// console.log(this.adressMoRen, '默认地址')				
-				this.cartList.forEach((item, index) => {
-					key.push({
-						productId: item.productId,
-						quantity: item.productAmount
-					})
-					//	dataToString = dataToString.concat(item.productId+"="+item.productAmount+"&")
-				})
-				// console.log(key,'this.adressMoRen.areaidpath')
+    // 获取购物车列表
+    getCartList() {
+      console.log(
+        "购物车列表1111111111111111111111111",
+        this.cartIDNum.toString()
+      );
+      this.cartList = [];
+      this.$http
+        .request({
+          // url: "book/buyOrder/calculateTransportPrice/",
+          url: "/book/buyOrder/getShopProductListByIds",
+          // url: "book/buyorder/getTransPrice/" + this.adressMoRen.areaidpath + "?" + dataToString,
+          method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+          data: {
+            productIds: this.cartIDNum.map((e) => e.productId).toString(),
+          },
+          header: {
+            //默认 无 说明：请求头
+            "Content-Type": "application/json",
+          },
+        })
+        .then((res) => {
+          this.cartList = res.shopProductList.map((e, i) => {
+            let prodCont = {};
+            prodCont.productId = e.productId;
+            prodCont.image = e.productImages;
+            prodCont.productName = e.productName;
+            prodCont.productAmount = this.cartIDNum[i].num;
+            prodCont.isVipPrice = e.isVipPrice;
+            prodCont.vipPrice = e.vipPrice;
+            prodCont.activityPrice = e.activityPrice;
 
-				$http.request({
-					// url: "book/buyOrder/calculateTransportPrice/",
-					url: "book/buyOrder/calculateTransportPrice",
-					// url: "book/buyorder/getTransPrice/" + this.adressMoRen.areaidpath + "?" + dataToString,
-					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
-					data: {
-						'regionCode': this.adressMoRen.regionCode,
-						'products': key,
-						loadAnimate: 'none', // 请求加载动画
-					},
-					header: { //默认 无 说明：请求头
-						'Content-Type': 'application/json'
-					},
-				}).then(res => {
-					if (res.code == 0) {
-						this.farePrice = res.result
-						console.log('需要的运费', res.result)
-						this.allPrice()
-					}
+            // if (prodCont.isVipPrice == 1 && prodCont.vipPrice != 0) {
+            //   prodCont.price = e.price;
+            // } else {
+            //   if (
+            //     e.activityPrice &&
+            //     e.activityPrice > 0
+            //   ) {
+            //     prodCont.price = e.activityPrice;
+            //   } else {
+            //     prodCont.price = e.price;
 
-				})
-			},
+            //   }
+            // }
+            prodCont.price = e.price.toFixed(2);
+            prodCont.weight = e.weight;
+            return prodCont;
+          });
 
-			// 总价
-			allPrice() {
-				let allprice = 0;
-				this.cartList.forEach((item, index) => {
-					let price = 0;
-					if (item.activityPrice && item.activityPrice > 0) {
-						price = item.productAmount * item.activityPrice;
-					} else {
-						price = item.productAmount * item.price;
-					}
-					allprice += price
-				})
-				this.totalPrice = allprice
-				// if (this.youhuiContent.id != undefined) {
-				// 	this.realPrice = this.totalPrice - this.youhuiContent.coupons.couponAmount
-				// } else {
-				 	this.realPrice = this.totalPrice
-				// }
-				this.realPrice = this.realPrice + this.farePrice
-			},
-			// 超出阈值时
-			overlimit() {
-				uni.showToast({
-					title: '超出商品数量',
-					icon: 'error',
-					duration: 1000
-				})
-			},
-			// 修改数量
-			valChange(e, item) {
-				let productItem = {}
-				productItem = item
-				productItem.productAmount = e.value
-				this.updateCart(productItem)
-				this.$nextTick(() => {
-					this.getYunFei()
-					// this.getCourpe()
-				})
+          // this.getCourpe()
+          this.getUserAddress();
+        });
+    },
+    // 获取运费
+    getYunFei() {
+      let key = [];
+      let dataToString = "";
+      // console.log(this.adressMoRen, '默认地址')
+      this.cartList.forEach((item, index) => {
+        key.push({
+          productId: item.productId,
+          quantity: item.productAmount,
+        });
+        //	dataToString = dataToString.concat(item.productId+"="+item.productAmount+"&")
+      });
+      // console.log(key,'this.adressMoRen.areaidpath')
 
-			},
+      $http
+        .request({
+          // url: "book/buyOrder/calculateTransportPrice/",
+          url: "book/buyOrder/calculateTransportPrice",
+          // url: "book/buyorder/getTransPrice/" + this.adressMoRen.areaidpath + "?" + dataToString,
+          method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+          data: {
+            regionCode: this.adressMoRen.regionCode,
+            products: key,
+            loadAnimate: "none", // 请求加载动画
+          },
+          header: {
+            //默认 无 说明：请求头
+            "Content-Type": "application/json",
+          },
+        })
+        .then((res) => {
+          if (res.code == 0) {
+            this.farePrice = res.result;
+            console.log("需要的运费", res.result);
+            this.allPrice();
+          }
+        });
+    },
+    getVipFei() {
+      let key = [];
+      let dataToString = "";
+      // console.log(this.adressMoRen, '默认地址')
+      this.cartList.forEach((item, index) => {
+        key.push({
+          productId: item.productId,
+          quantity: item.productAmount,
+        });
+        //	dataToString = dataToString.concat(item.productId+"="+item.productAmount+"&")
+      });
+      // console.log(key,'this.adressMoRen.areaidpath')
 
-			// 更新购物车
-			updateCart(shagnpin) {
-				// 已在购物车中添加
-				$http.request({
-					url: "book/ordercart/update",
-					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-					data: shagnpin,
-					header: { //默认 无 说明：请求头
-						'Content-Type': 'application/json'
-					}
-				}).then(res => {
-					if (res.code == 0) {
-						// uni.showToast({
-						// 	title: '加入购物车成功',
-						// 	duration: 1000,
-						// });
-					}
-				})
-			},
-			// 更改地址
-			choseDizhi(e) {
-				this.adressMoRIndex = e
-				this.adressMoRen = this.addressList[this.adressMoRIndex]
-				console.log(this.adressMoRen)
-				this.dizhiShow = false
-				this.getYunFei()
-			},
+      $http
+        .request({
+          // url: "book/buyOrder/calculateTransportPrice/",
+          url: "/book/buyOrder/getVipDiscountAmount",
+          // url: "book/buyorder/getTransPrice/" + this.adressMoRen.areaidpath + "?" + dataToString,
+          method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+          data: {
+            productList: key,
+          },
+          header: {
+            //默认 无 说明：请求头
+            "Content-Type": "application/json",
+          },
+        })
+        .then((res) => {
+          if (res.code == 0) {
+            console.log("res.code at line 538:", res);
+            this.vipPrice = res.discountAmount;
+            // console.log('需要的运费', res.result)
+            this.allPrice();
+          }
+        });
+    },
+    getDistrictAmount() {
+      let key = [];
+      let dataToString = "";
+      // console.log(this.adressMoRen, '默认地址')
+      this.cartList.forEach((item, index) => {
+        key.push({
+          productId: item.productId,
+          quantity: item.productAmount,
+        });
+        //	dataToString = dataToString.concat(item.productId+"="+item.productAmount+"&")
+      });
+      console.log(key, "this.adressMoRen.areaidpath");
 
-			// 添加地址
-			toAddress() {
-				uni.navigateTo({
-					url: '/pages/user/addAddress?type=0&index=0'
-				})
-			},
+      $http
+        .request({
+          // url: "book/buyOrder/calculateTransportPrice/",
+          url: "/book/buyOrder/getDistrictAmount",
+          // url: "book/buyorder/getTransPrice/" + this.adressMoRen.areaidpath + "?" + dataToString,
+          method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+          data: {
+            productList: key,
+          },
+          header: {
+            //默认 无 说明：请求头
+            "Content-Type": "application/json",
+          },
+        })
+        .then((res) => {
+          if (res.code == 0) {
+            console.log("res.code at line 538111111111111111:", res);
+            this.districtAmount = res.districtAmount;
+            // console.log('需要的运费', res.result)
+            this.allPrice();
+          }
+        });
+    },
 
-			// 选择优惠券
-			choseYouhui(e) {
-				this.youhuiIndex = e
-				this.youhuiContent = this.youhuiList[this.youhuiIndex]
-				this.allPrice()
-				this.youhuiShow = false
-			},
-			// 提交结算
-			goBuyJie() {
-				if (this.addressList.length == 0) {
-					this.dizhiShow = true // 如果没有地址信息
-					return
-				}
-				if (!this.nowClick) {
-					return
-				}
-				this.nowClick = false
-				setTimeout(() => {
-					this.nowClick = true
-				}, 5000)
-				let youPre = {
-					id: '',
-					coupons: {
-						amount: 0,
-						name: ''
-					}
-				};
-				if (this.youhuiContent.id != undefined) {
-					youPre = this.youhuiContent
-				}
-				let xiaBiao = [];
-				for (let i = 0; i < this.cartList.length; i++) {
-					xiaBiao.push({
-						productId: this.cartList[i].productId,
-						quantity: this.cartList[i].productAmount
-					})
-				}
-				let data = {
-					buyType: this.typeId, //0- 商品页直接下单  1- 购物车结算
-					userId: this.userInfo.id, //下单人ID
-					shippingUser: this.adressMoRen.consigneeName, //收货人姓名
-					userPhone: this.adressMoRen.consigneePhone, //收货人手机号					
+    // 总价
+    allPrice() {
+      let allprice = 0;
+      this.cartList.forEach((item, index) => {
+        let price = 0;
+        // if (item.isVipPrice == 1 && item.vipPrice != 0) {
+        //   price = item.productAmount * item.price;
+        // } else {
+        //   if (item.activityPrice && item.activityPrice > 0) {
+        //     price = (item.productAmount * item.activityPrice).toFixed(2);
+        //   } else {
+        //     price = (item.productAmount * item.price).toFixed(2);
 
-					// province: this.adressMoRen.areaidpathtext.split(' ')[0], //省
-					// city: this.adressMoRen.areaidpathtext.split(' ')[1], //市
-					// district: this.adressMoRen.areaidpathtext.split(' ')[2], //区					
-					//address: this.adressMoRen.useraddress, //地址
+        //   }
+        // }
+        price = (item.productAmount * item.price).toFixed(2);
+        allprice += Number(price);
+      });
+      this.totalPrice = allprice;
+      // if (this.youhuiContent.id != undefined) {
+      // 	this.realPrice = this.totalPrice - this.youhuiContent.coupons.couponAmount
+      // } else {
+      this.realPrice = this.totalPrice;
+      // }
+      this.realPrice = Number(
+        this.realPrice + this.farePrice - this.vipPrice - this.districtAmount
+      );
+      console.log("this.realPrice at line 601:", this.realPrice);
+    },
+    // 超出阈值时
+    overlimit() {
+      uni.showToast({
+        title: "超出商品数量",
+        icon: "error",
+        duration: 1000,
+      });
+    },
+    // 修改数量
+    valChange(e, item) {
+      let productItem = {};
+      productItem = item;
+      productItem.productAmount = e.value;
+      this.updateCart(productItem);
+      this.$nextTick(() => {
+        this.getYunFei();
+        this.getVipFei();
+        this.getDistrictAmount();
+        // this.getCourpe()
+      });
+    },
 
-					paymentMethod: this.payType, //支付方式   2支付宝，1微信，3ios内购    4，天医币购买
-					orderMoney: this.totalPrice, //订单金额
-					realMoney: this.realPrice, //实收金额
-					shippingMoney: this.farePrice, //运费
-					couponId: youPre.id, //优惠券Id
-					isSend: this.isSend,
-					couponName: youPre.coupons.name, //优惠券名称
-					districtMoney: youPre.coupons.amount, //优惠金额
-					orderStatus: 0, //订单状态
-					productList: xiaBiao, //订单列表商品
-					orderType: "order", //订单类型
-					addressId: this.adressMoRen.id, // 地址ID
-					jfDeduction:0,//积分抵扣
-				}
-				$http.request({
-					// url: "book/buyOrder/buySave",
-					url: "book/buyOrder/placeOrder",
-					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-					data,
-					header: { //默认 无 说明：请求头
-						'Content-Type': 'application/json'
-					},
-				}).then(res => {
-					if (res.code == 0) {
-						if (res.orderSn == null) {
-							uni.showToast({
-								title: "失败,请重新下单",
-								icon: "none",
-								image: '../../static/icon/ic_close.png'
-							});
-						} else {
-							if (this.payType == 2) {
-								// 常规支付
-								uni.showToast({
-									title: "正在支付",
-									icon: "loading"
-								});
-								setPay({
-									typePay: 'alipay',
-									subject: 'order',
-									totalAmount: res.money,
-									type: 2,
-									relevanceoid: res.orderSn,
-									customerId: this.userInfo.id,
-								}, res => {
-									if (res.success) {
-										uni.showToast({
-											title: "支付成功"
-										});
-										setTimeout(() => {
-											uni.navigateTo({
-												url: '/pages/bookShop/orderList'
-											});	
-											// uni.navigateTo({
-											// 	url: './orderList'
-											// });
-										}, 1000)
-									} else {
-										uni.showToast({
-											title: "支付失败",
-											icon: "none",
-											image: '../../static/icon/ic_close.png'
-										});
-										// setTimeout(() => {
+    // 更新购物车
+    updateCart(shagnpin) {
+      // 已在购物车中添加
+      $http
+        .request({
+          url: "book/ordercart/update",
+          method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+          data: shagnpin,
+          header: {
+            //默认 无 说明：请求头
+            "Content-Type": "application/json",
+          },
+        })
+        .then((res) => {
+          if (res.code == 0) {
+            // uni.showToast({
+            // 	title: '加入购物车成功',
+            // 	duration: 1000,
+            // });
+          }
+        });
+    },
+    // 更改地址
+    choseDizhi(e) {
+      this.adressMoRIndex = e;
+      this.adressMoRen = this.addressList[this.adressMoRIndex];
+      console.log(this.adressMoRen);
+      this.dizhiShow = false;
+      this.getYunFei();
+      this.getVipFei();
+      this.getDistrictAmount();
+    },
 
-										// 	uni.navigateTo({
-										// 		url: './orderList'
-										// 	});
-										// }, 1000)
-									}
-								})
-							} else if (this.payType == 1) {
-								// 微信支付
-								let data1 = {
-									orderSn: res.orderSn,
-									buyOrderId: null,
-									totalAmount: res.money
-								}
-								setWXPay(data1, res => {
-									if (res.success) {
-										uni.showToast({
-											title: "支付成功"
-										});
-										setTimeout(() => {
-											uni.navigateTo({
-												url: '/pages/bookShop/orderList'
-											});	
-										}, 1000)
-									} else {
-										console.log(res)
-										if (res.data.errMsg.indexOf('User canceled') != -1) {
-											uni.showToast({
-												title: "用户取消支付",
-												icon: "none",
-												image: '../../static/icon/ic_close.png'
-											});
-										} else {
-											uni.showToast({
-												title: "支付失败",
-												icon: "none",
-												image: '../../static/icon/ic_close.png'
-											});
-										}
-									}
-								})
-							} else if (this.payType == 4) {
-								// 天医币支付
-								uni.showToast({
-									title: "购买成功",
-									icon: "success"								
-								});
-								setTimeout(() => {
-									uni.navigateTo({
-										url: '/pages/bookShop/orderList'
-									});									
-								}, 1000)
-							}
-						}
+    // 添加地址
+    toAddress() {
+      uni.navigateTo({
+        url: "/pages/user/addAddress?type=0&index=0",
+      });
+    },
 
+    // 选择优惠券
+    choseYouhui(e) {
+      this.youhuiIndex = e;
+      this.youhuiContent = this.youhuiList[this.youhuiIndex];
+      this.allPrice();
+      this.youhuiShow = false;
+    },
+    // 提交结算
+    goBuyJie() {
+      if (this.addressList.length == 0) {
+        this.dizhiShow = true; // 如果没有地址信息
+        return;
+      }
+      if (!this.nowClick) {
+        return;
+      }
+      this.nowClick = false;
+      setTimeout(() => {
+        this.nowClick = true;
+      }, 5000);
+      let youPre = {
+        id: "",
+        coupons: {
+          amount: 0,
+          name: "",
+        },
+      };
+      if (this.youhuiContent.id != undefined) {
+        youPre = this.youhuiContent;
+      }
+      let xiaBiao = [];
+      for (let i = 0; i < this.cartList.length; i++) {
+        xiaBiao.push({
+          productId: this.cartList[i].productId,
+          quantity: this.cartList[i].productAmount,
+        });
+      }
+      let data = {
+        buyType: this.typeId, //0- 商品页直接下单  1- 购物车结算
+        userId: this.userInfo.id, //下单人ID
+        shippingUser: this.adressMoRen.consigneeName, //收货人姓名
+        userPhone: this.adressMoRen.consigneePhone, //收货人手机号
 
-					}
-				})
-			},
-		}
-	}
+        // province: this.adressMoRen.areaidpathtext.split(' ')[0], //省
+        // city: this.adressMoRen.areaidpathtext.split(' ')[1], //市
+        // district: this.adressMoRen.areaidpathtext.split(' ')[2], //区
+        //address: this.adressMoRen.useraddress, //地址
+
+        paymentMethod: this.payType, //支付方式   2支付宝，1微信，3ios内购    4，天医币购买
+        orderMoney: this.totalPrice, //订单金额
+        vipDiscountAmount: this.vipPrice, //折扣金额
+        districtMoney: this.districtAmount, //折扣金额
+        realMoney: this.realPrice, //实收金额
+        shippingMoney: this.farePrice, //运费
+        couponId: youPre.id, //优惠券Id
+        isSend: this.isSend,
+        couponName: youPre.coupons.name, //优惠券名称
+        // districtMoney: youPre.coupons.amount, //优惠金额
+        orderStatus: 0, //订单状态
+        productList: xiaBiao, //订单列表商品
+        orderType: "order", //订单类型
+        addressId: this.adressMoRen.id, // 地址ID
+        jfDeduction: 0, //积分抵扣
+      };
+  
+      console.log('data at line 下单传参:', data)
+      $http
+        .request({
+          // url: "book/buyOrder/buySave",
+          url: "book/buyOrder/placeOrder",
+          method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+          data,
+          header: {
+            //默认 无 说明：请求头
+            "Content-Type": "application/json",
+          },
+        })
+        .then((res) => {
+          if (res.code == 0) {
+            if (res.orderSn == null) {
+              uni.showToast({
+                title: "失败,请重新下单",
+                icon: "none",
+                image: "../../static/icon/ic_close.png",
+              });
+            } else {
+              if (this.payType == 2) {
+                // 常规支付
+                uni.showToast({
+                  title: "正在支付",
+                  icon: "loading",
+                });
+                setPay(
+                  {
+                    typePay: "alipay",
+                    subject: "order",
+                    totalAmount: res.money,
+                    type: 2,
+                    relevanceoid: res.orderSn,
+                    customerId: this.userInfo.id,
+                  },
+                  (res) => {
+                    if (res.success) {
+                      uni.showToast({
+                        title: "支付成功",
+                      });
+                      setTimeout(() => {
+                        uni.navigateTo({
+                          url: "/pages/bookShop/orderList",
+                        });
+                        // uni.navigateTo({
+                        // 	url: './orderList'
+                        // });
+                      }, 1000);
+                    } else {
+                      uni.showToast({
+                        title: "支付失败",
+                        icon: "none",
+                        image: "../../static/icon/ic_close.png",
+                      });
+                      // setTimeout(() => {
+
+                      // 	uni.navigateTo({
+                      // 		url: './orderList'
+                      // 	});
+                      // }, 1000)
+                    }
+                  }
+                );
+              } else if (this.payType == 1) {
+                // 微信支付
+                let data1 = {
+                  orderSn: res.orderSn,
+                  buyOrderId: null,
+                  totalAmount: res.money,
+                };
+                setWXPay(data1, (res) => {
+                  if (res.success) {
+                    uni.showToast({
+                      title: "支付成功",
+                    });
+                    setTimeout(() => {
+                      uni.navigateTo({
+                        url: "/pages/bookShop/orderList",
+                      });
+                    }, 1000);
+                  } else {
+                    console.log(res);
+                    if (res.data.errMsg.indexOf("User canceled") != -1) {
+                      uni.showToast({
+                        title: "用户取消支付",
+                        icon: "none",
+                        image: "../../static/icon/ic_close.png",
+                      });
+                    } else {
+                      uni.showToast({
+                        title: "支付失败",
+                        icon: "none",
+                        image: "../../static/icon/ic_close.png",
+                      });
+                    }
+                  }
+                });
+              } else if (this.payType == 4) {
+                // 天医币支付
+                uni.showToast({
+                  title: "购买成功",
+                  icon: "success",
+                });
+                setTimeout(() => {
+                  uni.navigateTo({
+                    url: "/pages/bookShop/orderList",
+                  });
+                }, 1000);
+              }
+            }
+          }
+        });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.addShouhuo {
-		padding: 30rpx 50rpx 30rpx 100rpx;
-		background-color: #fff;
-		border-top: 1px solid #eee;
-		border-bottom: 2px dashed #b2e9d7;
-		margin: 0 0 20rpx 0;
-		font-size: 35rpx;
+.addShouhuo {
+  padding: 30rpx 50rpx 30rpx 100rpx;
+  background-color: #fff;
+  border-top: 1px solid #eee;
+  border-bottom: 2px dashed #b2e9d7;
+  margin: 0 0 20rpx 0;
+  font-size: 35rpx;
+}
 
-	}
+.adDefault {
+  padding: 30rpx 50rpx 30rpx 100rpx;
+  background-color: #fff;
+  border-top: 1px solid #eee;
+  border-bottom: 2px dashed #b2e9d7;
+  margin: 0 0 20rpx 0;
+  position: relative;
 
-	.adDefault {
-		padding: 30rpx 50rpx 30rpx 100rpx;
-		background-color: #fff;
-		border-top: 1px solid #eee;
-		border-bottom: 2px dashed #b2e9d7;
-		margin: 0 0 20rpx 0;
-		position: relative;
+  .defalTop {
+    .userName {
+      font-size: 35rpx;
+      font-weight: bold;
+      margin-right: 30rpx;
+    }
 
-		.defalTop {
-			.userName {
-				font-size: 35rpx;
-				font-weight: bold;
-				margin-right: 30rpx;
-			}
+    .userTel {
+      font-size: 25rpx;
+      color: #888;
+    }
 
-			.userTel {
-				font-size: 25rpx;
-				color: #888;
-			}
+    .userMoren {
+      border: 1px solid #fd6004;
+      color: #fd6004;
+      padding: 3rpx 10rpx;
+      font-size: 22rpx;
+      border-radius: 10rpx;
+      margin: 0 0 0 20rpx;
+    }
+  }
 
+  .defalBottom {
+    .userAddress {
+      font-size: 32rpx;
+      line-height: 40rpx;
+    }
+  }
 
-			.userMoren {
-				border: 1px solid #fd6004;
-				color: #fd6004;
-				padding: 3rpx 10rpx;
-				font-size: 22rpx;
-				border-radius: 10rpx;
-				margin: 0 0 0 20rpx;
-			}
+  .defalLeft {
+    position: absolute;
+    left: 30rpx;
+    top: 55rpx;
+  }
 
-		}
+  .defalRight {
+    position: absolute;
+    right: 10rpx;
+    top: 60rpx;
+  }
+}
 
-		.defalBottom {
-			.userAddress {
-				font-size: 32rpx;
-				line-height: 40rpx;
-			}
-		}
+.cartItem {
+  padding: 10rpx 20rpx 10rpx 30rpx;
+  border-bottom: 1px solid #eee;
+  display: flex;
+  align-items: center;
+  background-color: #fff;
 
-		.defalLeft {
-			position: absolute;
-			left: 30rpx;
-			top: 55rpx;
-		}
+  .cartContent {
+    flex: 1;
+    display: flex;
 
-		.defalRight {
-			position: absolute;
-			right: 10rpx;
-			top: 60rpx;
-		}
-	}
+    image {
+      width: 150rpx;
+      height: 180rpx;
+      border-radius: 10rpx;
+      padding: 10rpx;
+      margin-right: 15rpx;
+    }
 
-	.cartItem {
-		padding: 10rpx 20rpx 10rpx 30rpx;
-		border-bottom: 1px solid #eee;
-		display: flex;
-		align-items: center;
-		background-color: #fff;
+    .itemCenter {
+      flex: 1;
+      flex-direction: column;
+      justify-content: space-around;
+    }
 
+    .cartTitle {
+      font-size: 30rpx;
+      margin: 35rpx 0 20rpx 0;
+    }
 
-		.cartContent {
-			flex: 1;
-			display: flex;
+    .itemPrice {
+      font-size: 28rpx;
+      display: flex;
+      justify-content: space-between;
+    }
+  }
+}
 
-			image {
-				width: 150rpx;
-				height: 180rpx;
-				border-radius: 10rpx;
-				padding: 10rpx;
-				margin-right: 15rpx;
-			}
+.youhui_quan {
+  margin: 20rpx 0 0 0;
+  padding: 30rpx 40rpx 0 40rpx;
+  background-color: #fff;
+  border-bottom: 1px solid #eee;
 
-			.itemCenter {
-				flex: 1;
-				flex-direction: column;
-				justify-content: space-around;
-			}
+  .yq_alljia {
+    text {
+      float: right;
+      color: #bf0c0c;
+    }
+  }
 
-			.cartTitle {
-				font-size: 30rpx;
-				margin: 35rpx 0 20rpx 0;
-			}
+  .yq_youhui {
+    .yqLeft {
+      display: inline-block;
+      margin-right: 10rpx;
+    }
 
-			.itemPrice {
-				font-size: 28rpx;
-				display: flex;
-				justify-content: space-between;
-			}
-		}
-	}
+    .yqRight {
+      float: right;
+    }
 
-	.youhui_quan {
-		margin: 20rpx 0 0 0;
-		padding: 30rpx 40rpx 0 40rpx;
-		background-color: #fff;
-		border-bottom: 1px solid #eee;
+    .dagnqian {
+      float: right;
+      font-size: 22rpx;
+      background-color: #dd1919;
+      color: #fff;
+      border-radius: 20rpx;
+      padding: 5rpx 10rpx;
+    }
+  }
 
+  .yq_yunfei {
+    .yqLeft {
+      display: inline-block;
+      margin-right: 10rpx;
+    }
 
-		.yq_alljia {
-			text {
-				float: right;
-				color: #bf0c0c;
-			}
-		}
+    text {
+      float: right;
+    }
+  }
 
-		.yq_youhui {
-			.yqLeft {
-				display: inline-block;
-				margin-right: 10rpx;
-			}
+  .yq_beizhu {
+    color: #aaa;
+    font-size: 24rpx;
+  }
+}
 
-			.yqRight {
-				float: right;
-			}
+.youhui_quan > view {
+  font-size: 32rpx;
+  padding-bottom: 20rpx;
+  margin-bottom: 20rpx;
+  border-bottom: 1px solid #ededed;
+}
 
-			.dagnqian {
-				float: right;
-				font-size: 22rpx;
-				background-color: #dd1919;
-				color: #fff;
-				border-radius: 20rpx;
-				padding: 5rpx 10rpx;
-			}
-		}
+.zhif_fangsh {
+  margin: 20rpx 0 120rpx 0;
+  padding: 30rpx 40rpx 0 40rpx;
+  background-color: #fff;
+  border-bottom: 1px solid #eee;
+  padding-bottom: 90rpx;
 
-		.yq_yunfei {
-			.yqLeft {
-				display: inline-block;
-				margin-right: 10rpx;
-			}
+  .zhif_radio {
+    .zhif_xuanx {
+      font-size: 32rpx;
+      padding-bottom: 20rpx;
+      margin-bottom: 20rpx;
+      border-bottom: 1px solid #ededed;
 
-			text {
-				float: right;
-			}
-		}
+      image {
+        width: 40rpx;
+        height: 40rpx;
+        display: inline-block;
+        margin-right: 20rpx;
+        vertical-align: bottom;
+      }
+    }
 
-		.yq_beizhu {
-			color: #aaa;
-			font-size: 24rpx;
-		}
-	}
+    .zhif_xuanx:last-child {
+      border-bottom: none !important;
+    }
+  }
+}
 
-	.youhui_quan>view {
-		font-size: 32rpx;
-		padding-bottom: 20rpx;
-		margin-bottom: 20rpx;
-		border-bottom: 1px solid #ededed;
-	}
+.footer {
+  width: 100%;
+  height: 100rpx;
+  background-color: #fff;
+  border-top: 1px solid #eee;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  position: fixed;
+  bottom: 0%;
 
+  .commodityPrice {
+    font-size: 40rpx;
+    color: #bf0c0c;
+    font-weight: 700;
+    margin-left: 40rpx;
 
-	.zhif_fangsh {
-		margin: 20rpx 0 120rpx 0;
-		padding: 30rpx 40rpx 0 40rpx;
-		background-color: #fff;
-		border-bottom: 1px solid #eee;
-		 padding-bottom: 90rpx;
+    span {
+      font-size: 15px;
+    }
+  }
 
-		.zhif_radio {
+  .operate {
+    display: flex;
 
-			.zhif_xuanx {
-				font-size: 32rpx;
-				padding-bottom: 20rpx;
-				margin-bottom: 20rpx;
-				border-bottom: 1px solid #ededed;
+    .goBuy {
+      font-size: 32rpx;
+      color: #fff;
+      padding: 32rpx 60rpx;
+      letter-spacing: 0.8px;
+      background-color: #a53008;
+    }
+  }
+}
 
-				image {
-					width: 40rpx;
-					height: 40rpx;
-					display: inline-block;
-					margin-right: 20rpx;
-					vertical-align: bottom;
-				}
-				
-			}.zhif_xuanx:last-child{
-					border-bottom:none !important;
-				}
-			
+.tanchu {
+  padding: 40rpx 30rpx 40rpx 30rpx;
+  position: relative;
 
-		}
+  .dp_title {
+    font-size: 32rpx;
+    margin-bottom: 50rpx;
+    color: #555;
+    text-align: center;
+    font-weight: bold;
+  }
 
+  .dp_add {
+    position: absolute;
+    top: 40rpx;
+    right: 30rpx;
+    font-size: 22rpx;
+    background-color: #fd6004;
+    color: #fff;
+    border-radius: 10rpx;
+    padding: 5rpx 10rpx;
 
+    .u-icon {
+      display: inline-block;
+      margin-right: 5rpx;
+    }
+  }
 
-	}
+  .addressItem {
+    border: 2px dashed #d9d9d9;
+    border-radius: 10rpx;
+    width: 100%;
+    display: flex;
+    padding: 20rpx 10rpx;
+    margin: 25rpx 0 0 0;
+    align-items: center;
+    background-color: #fff;
 
-	.footer {
-		width: 100%;
-		height: 100rpx;
-		background-color: #fff;
-		border-top: 1px solid #eee;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		position: fixed;
-		bottom: 0%;
+    .addrContent {
+      margin-left: 40rpx;
+      flex: 1;
 
-		.commodityPrice {
-			font-size: 40rpx;
-			color: #bf0c0c;
-			font-weight: 700;
-			margin-left: 40rpx;
+      .addrContentTop {
+        display: flex;
+        align-items: flex-end;
+        margin: 0 0 15rpx 0;
+        position: relative;
 
-			span {
-				font-size: 15px;
-			}
-		}
+        .userName {
+          font-size: 35rpx;
+          font-weight: bold;
+          margin-right: 30rpx;
+        }
 
-		.operate {
-			display: flex;
+        .userTel {
+          font-size: 25rpx;
+          color: #888;
+        }
 
-			.goBuy {
-				font-size: 32rpx;
-				color: #fff;
-				padding: 32rpx 60rpx;
-				letter-spacing: 0.8px;
-				background-color: #a53008;
-			}
-		}
-	}
+        .userMoren {
+          border: 1px solid #fd6004;
+          color: #fd6004;
+          padding: 3rpx 10rpx;
+          font-size: 22rpx;
+          border-radius: 10rpx;
+          margin: 0 0 0 20rpx;
+        }
 
+        .chooseCheck {
+          position: absolute;
+          top: 3rpx;
+          right: 6rpx;
+        }
+      }
 
-	.tanchu {
-		padding: 40rpx 30rpx 40rpx 30rpx;
-		position: relative;
+      .addrContentBottom {
+        font-size: 32rpx;
+      }
+    }
+  }
 
+  .addressItem.addItem_style {
+    border-color: #fd6004;
+  }
 
-		.dp_title {
-			font-size: 32rpx;
-			margin-bottom: 50rpx;
-			color: #555;
-			text-align: center;
-			font-weight: bold;
-		}
+  .youhuiItem {
+    border: 1px solid #d9d9d9;
+    border-radius: 10rpx;
+    width: 100%;
+    display: flex;
+    padding: 20rpx 10rpx;
+    margin: 25rpx 0 0 0;
+    align-items: center;
+    background-color: #fff;
+    font-size: 30rpx;
+  }
 
-		.dp_add {
-			position: absolute;
-			top: 40rpx;
-			right: 30rpx;
-			font-size: 22rpx;
-			background-color: #fd6004;
-			color: #fff;
-			border-radius: 10rpx;
-			padding: 5rpx 10rpx;
+  .youhuiItem > view {
+    float: left;
+  }
 
-			.u-icon {
-				display: inline-block;
-				margin-right: 5rpx;
-			}
-		}
+  .youhuiItem.youItem_style {
+    border-color: #fd6004;
+  }
+}
 
-		.addressItem {
-			border: 2px dashed #d9d9d9;
-			border-radius: 10rpx;
-			width: 100%;
-			display: flex;
-			padding: 20rpx 10rpx;
-			margin: 25rpx 0 0 0;
-			align-items: center;
-			background-color: #fff;
-
-			.addrContent {
-				margin-left: 40rpx;
-				flex: 1;
-
-				.addrContentTop {
-					display: flex;
-					align-items: flex-end;
-					margin: 0 0 15rpx 0;
-					position: relative;
-
-					.userName {
-						font-size: 35rpx;
-						font-weight: bold;
-						margin-right: 30rpx;
-					}
-
-					.userTel {
-						font-size: 25rpx;
-						color: #888;
-					}
-
-					.userMoren {
-						border: 1px solid #fd6004;
-						color: #fd6004;
-						padding: 3rpx 10rpx;
-						font-size: 22rpx;
-						border-radius: 10rpx;
-						margin: 0 0 0 20rpx;
-					}
-
-
-					.chooseCheck {
-						position: absolute;
-						top: 3rpx;
-						right: 6rpx;
-					}
-				}
-
-				.addrContentBottom {
-					font-size: 32rpx;
-				}
-			}
-		}
-
-
-		.addressItem.addItem_style {
-			border-color: #fd6004;
-		}
-
-		.youhuiItem {
-			border: 1px solid #d9d9d9;
-			border-radius: 10rpx;
-			width: 100%;
-			display: flex;
-			padding: 20rpx 10rpx;
-			margin: 25rpx 0 0 0;
-			align-items: center;
-			background-color: #fff;
-			font-size: 30rpx;
-		}
-
-		.youhuiItem>view {
-			float: left;
-		}
-
-		.youhuiItem.youItem_style {
-			border-color: #fd6004;
-		}
-	}
-
-	.chongBtn {
-		background-color: #54a966;
-		color: #fff !important;
-		margin-left: 20rpx;
-		border-radius: 10rpx;
-		padding: 2rpx 10rpx;
-		font-size: 20rpx;
-		display: inline-block;
-	}
-</style>
\ No newline at end of file
+.chongBtn {
+  background-color: #54a966;
+  color: #fff !important;
+  margin-left: 20rpx;
+  border-radius: 10rpx;
+  padding: 2rpx 10rpx;
+  font-size: 20rpx;
+  display: inline-block;
+}
+</style>
diff --git a/pages/peanut/home.vue b/pages/peanut/home.vue
index b35c35e..25d6e42 100644
--- a/pages/peanut/home.vue
+++ b/pages/peanut/home.vue
@@ -265,28 +265,43 @@
 			<!-- 精选 -->
 			<view class="">
 				<view v-if="tjProList.length > 0">
-					<view class="flexbox" style="flex-wrap: wrap">
+					<view class="flexbox" style="flex-wrap: wrap;">
 						<view class="goodsItem" v-for="(item, index) in tjProList" :key="index"
-							@click="goDetail(item.product_id)">
+							style="position: relative;" @click="goDetail(item.product_id)">
 							<image :src="item.product_images" mode="" class="goodsImg"></image>
 							<view class="goodsContent">
 								<view class="goodsName">
 									{{ item.product_name }}
 								</view>
-								<view class="goodsPrice">
-									<view style="display: flex; align-items: center"
-										v-if="item.activity_price && item.activity_price > 0">
-										<span class="price">￥{{ item.activity_price }}</span>
-										<span v-if="item.activity_price != item.price" class="Salesnum" style="
-                        margin-left: 10rpx;
-                        margin-top: 2rpx;
-                        text-decoration: line-through;
-                      ">￥{{ item.price }}</span>
-									</view>
+								<view class="goodsPrice" style="">
+									
 
-									<span class="price" v-else>￥{{ item.price }}</span>
-									<span class="Salesnum">已售:{{ item.sum_sales }} 件</span>
+									<text v-if="item.is_vip_price==1&&item.vip_price!=0">
+									<text style="color: #e97512;font-size: 12px;font-weight: bold;">￥{{(item.vip_price).toFixed(2)}}</text>
+									<!-- <text style="color: #fa2d12;font-size: 10px;margin-left: 4px;">VIP到手价</text> -->
+									<text style="color: #8a8a8a;font-size: 10px;margin-left: 4px;font-weight: bold;text-decoration: line-through;">￥{{(item.price).toFixed(2)}}</text>
+									
+									
+								
+								</text>
+
+							<text
+								v-else-if="item.activity_price && item.activity_price > 0">
+								<text style="color: #e97512;font-size: 12px;font-weight: bold;">￥{{(item.activity_price).toFixed(2)}}</text>
+								<!-- <text style="color: #613804;font-size: 10px;margin-left: 4px;">活动价</text> -->
+									<text style="color: #8a8a8a;font-size: 10px;margin-left: 4px;font-weight: bold;text-decoration: line-through;">￥{{(item.price).toFixed(2)}}</text>
+									
+								
+							
+							</text>
+
+					
+									<span class="price" style=" color: #e97512;font-size: 12px;" v-else>￥{{ item.price }}</span>
+									<span class="Salesnum" style="font-size: 10px !important;line-height: 24px;">已售:{{ item.sum_sales }} 件</span>
 								</view>
+								<view  v-if="item.is_vip_price==1&&item.vip_price!=0&&item.vip_price!=null"
+									style="position: absolute;top: 10rpx;left: 10px;text-align: center;font-size: 22rpx;background-color: #f94f04;color: #fff;font-weight: bold;border-radius:4px;width: 120rpx; padding:4px;box-sizing: border-box;">
+									VIP优惠</view>
 							</view>
 						</view>
 					</view>
@@ -460,12 +475,12 @@
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
 			// this.requestIapOrder()
-			this.$nextTick(()=>{
+			this.$nextTick(() => {
 
-this.getAdvertisement()
+				this.getAdvertisement()
+
+			})
 
-})
-	
 		},
 		onHide() {
 			this.page = 1;
@@ -546,27 +561,27 @@ this.getAdvertisement()
 			...mapMutations(["setUserInfo"]),
 
 			async getAdvertisement() {
-      await $http
-        .request({
-          url: "common/mainAd/getMainAd",
-          method: "POST",
-          data: {
-            type: 0,
-          },
-          header: {
-            //默认 无 说明：请求头
-            "Content-Type": "application/json",
-          },
-        })
-        .then(async (res) => {
-          console.log("res at line 61511111111111111:", res);
-          if (res.code == 0 && res.list && res.list.length > 0) {
-            this.advertisementList = res.list;
+				await $http
+					.request({
+						url: "common/mainAd/getMainAd",
+						method: "POST",
+						data: {
+							type: 0,
+						},
+						header: {
+							//默认 无 说明：请求头
+							"Content-Type": "application/json",
+						},
+					})
+					.then(async (res) => {
+						console.log("res at line 61511111111111111:", res);
+						if (res.code == 0 && res.list && res.list.length > 0) {
+							this.advertisementList = res.list;
 
-            this.$refs.commonAdvertisement.open();
-          }
-        });
-    },
+							this.$refs.commonAdvertisement.open();
+						}
+					});
+			},
 			requestAll() {
 				this.getUserInfo();
 				this.tjProList = [];
@@ -740,6 +755,7 @@ this.getAdvertisement()
 					.then((res) => {
 						if (res.code == 0 && res.result.length > 0) {
 							this.tjProList = res.result;
+							console.log('列表列表this.tjProList at line 745:', this.tjProList)
 						} else {
 							this.tjProList = [];
 							this.status = 3;
@@ -1803,7 +1819,7 @@ this.getAdvertisement()
 			display: inline-block;
 			width: 46%;
 			border-radius: 20rpx;
-			padding: 25rpx;
+			padding: 20rpx;
 			padding-bottom: 5rpx;
 			margin: 0 20rpx 20rpx 20rpx;
 			background-color: #fff;
@@ -1818,7 +1834,7 @@ this.getAdvertisement()
 			.goodsContent {
 				.goodsName {
 					margin-top: 10rpx;
-					font-size: 28rpx;
+					font-size: 26rpx;
 					// font-weight: bold;
 				}
 
diff --git a/pages/peanut/shopping.vue b/pages/peanut/shopping.vue
index 7a48536..f64d21e 100644
--- a/pages/peanut/shopping.vue
+++ b/pages/peanut/shopping.vue
@@ -5,20 +5,43 @@
 			<scroll-view scroll-y="true">
 				<view class="cartItem" v-for="(item,index) in cartList" :key="index">
 					<view class="select">
-						<checkbox :checked="item.checked" @click="checkboxGroupChange(index,item)"
+						<checkbox style="transform:scale(0.8)" :checked="item.checked" @click="checkboxGroupChange(index,item)"
 							class="round checkedItem" />
 					</view>
-					<view class="cartContent">
+					<view class="cartContent" style="position: relative;">
+						<span v-if="item.isVipPrice==1&&item.vipPrice!=0&&item.vipPrice!=null"
+									style="position: absolute;z-index: 10;top: 4px;left: 0px;margin-right: 10px;text-align: center;font-size: 18rpx;background-color: #f94f04;color: #fff;font-weight: bold;border-radius:4px;width: 80rpx; padding:2px 4px;box-sizing: border-box;">VIP优惠</span>
+								
 						<image :src="item.image" mode="" @click="goDetail(item.productId)"></image>
 						<view class="itemCenter">
-							<view class="cartTitle" @click="goDetail(item.productId)">
+							<view class="cartTitle" @click="goDetail(item.productId)" style="display: flex;align-items: center;">
 								<text>{{item.productName}}</text>
 							</view>
 							<view class="itemPrice">
-								<text v-if="item.activityPrice && item.activityPrice > 0">￥{{item.activityPrice*item.productAmount}}</text>
-								<text v-else>￥{{item.price*item.productAmount}}</text>
-								<u-number-box v-model="item.productAmount" @change="valChange($event,item)" :input-width="50"
-									:input-height="20" :min="1" :max="item.productStock" integer @overlimit='overlimit'></u-number-box>
+								<text v-if="item.isVipPrice==1&&item.vipPrice!=0&&item.vipPrice!=null">
+									<text style="color: #e97512;font-size: 16px;font-weight: bold;">￥{{(item.vipPrice).toFixed(2)}}</text>
+									<!-- <text style="color: #fa2d12;font-size: 10px;margin-left: 4px;">VIP到手价</text> -->
+									<text style="color: #8a8a8a;font-size: 14px;margin-left: 4px;font-weight: bold;text-decoration: line-through;">￥{{(item.price).toFixed(2)}}</text>
+									
+									
+								
+								</text>
+
+							<text
+								v-else-if="item.activityPrice && item.activityPrice > 0">
+								<text style="color: #e97512;font-size: 16px;font-weight: bold;">￥{{(item.activityPrice).toFixed(2)}}</text>
+								<!-- <text style="color: #613804;font-size: 10px;margin-left: 4px;">活动价</text> -->
+									<text style="color: #8a8a8a;font-size: 14px;margin-left: 4px;font-weight: bold;text-decoration: line-through;">￥{{(item.price).toFixed(2)}}</text>
+									
+								
+							
+							</text>
+
+							<text v-else style="color: #e97512;font-size: 16px;font-weight: bold;">￥{{item.price}}</text>
+							
+								<u-number-box button-size="20" v-model="item.productAmount" @change="valChange($event,item)"
+									:input-width="25" :input-height="10" :min="1" :max="item.productStock" integer
+									@overlimit='overlimit'></u-number-box>
 							</view>
 						</view>
 					</view>
@@ -29,13 +52,20 @@
 		<!-- 底部操作区 -->
 		<view class="shopCarFooter">
 			<view class="selectAll">
-				<checkbox :checked="all" @click="isSelectAll()" class="round checkedItem" />
+				<checkbox :checked="all" style="transform:scale(0.8)" @click="isSelectAll()" class="round checkedItem" />
 				<text class="cartCho">全选</text>
 				<!-- <text class="cartDel"  >删除</text> -->
-				<button class="mini-btn" style="border-radius: 40rpx; font-size: 30rpx; height: 56rpx;  line-height: 56rpx; margin-left: 6rpx;" v-if="isCartDelShow" @click="delCart()" type="warn" size="mini">删除</button>
+				<button class="mini-btn"
+					style="border-radius: 40rpx; font-size: 30rpx; height: 56rpx;  line-height: 56rpx; margin-left: 6rpx;"
+					v-if="isCartDelShow" @click="delCart()" type="warn" size="mini">删除</button>
 			</view>
 			<view class="exhibition">
-				<text class="total">合计: <b>￥{{totalPrice}}</b></text>
+				<view class="total">合计: <b>￥{{totalPrice}}</b>
+			
+				<!-- <text style="display: inline-block;width: 80%;color: #8a8a8a;font-size: 10px;">
+					不包含运费
+				</text> -->
+			</view>
 				<view class="settlement" @click="setTment()">
 					结算
 				</view>
@@ -59,7 +89,7 @@
 	export default {
 		data() {
 			return {
-				playData:{},
+				playData: {},
 				totalPrice: 0, // 总价
 				all: false, // 是否全选
 				isCartDelShow: false, // 是否展示删除按钮
@@ -84,8 +114,8 @@
 		computed: {
 			...mapState(['userInfo']),
 		},
-		components:{
-			musicPlay		
+		components: {
+			musicPlay
 		},
 		//方法
 		methods: {
@@ -135,36 +165,40 @@
 				this.cartList.forEach((item, index) => {
 					let price = 0;
 					if (item.checked) {
-						if(item.activityPrice && item.activityPrice > 0){
-							price = item.productAmount * item.activityPrice;
-						}else{
-							price = item.productAmount * item.price;
+						if (item.isVipPrice == 1 && item.vipPrice != 0) {
+						price = (item.productAmount * item.vipPrice).toFixed(2);
+					} else {
+						if (item.activityPrice && item.activityPrice > 0) {
+							price = (item.productAmount * item.activityPrice).toFixed(2);
+						} else {
+							price = (item.productAmount * item.price).toFixed(2);
 						}
 					}
-					allprice += price
+					}
+					allprice += Number(price)
 				})
-				this.totalPrice = allprice
-			},	
+				this.totalPrice = allprice.toFixed(2)
+			},
 			// 超出阈值时
-			overlimit(){
+			overlimit() {
 				uni.showToast({
-					title:'超出商品数量',
+					title: '超出商品数量',
 					icon: 'error',
 					duration: 1000
 				})
 			},
 			valChange(e, item) {
 				console.log(e)
-				let productItem = {}				
-				productItem = item				
+				let productItem = {}
+				productItem = item
 				productItem.productAmount = e.value
-					this.updateCart(productItem)
-					setTimeout(() => {
-						this.total()
-					}, 300)				
+				this.updateCart(productItem)
+				setTimeout(() => {
+					this.total()
+				}, 300)
 			},
 			// 更新购物车
-			updateCart(shagnpin){				
+			updateCart(shagnpin) {
 				// 已在购物车中添加
 				$http.request({
 					url: "book/ordercart/update",
@@ -211,7 +245,7 @@
 							}).then(res => {
 								this.isCartDelShow = false
 								this.totalPrice = 0
-								this.getCartList()								
+								this.getCartList()
 								uni.hideLoading()
 							})
 						} else {
@@ -223,27 +257,27 @@
 
 			// 跳转结算页面
 			setTment() {
-				let shangList=[]
+				let shangList = []
 				this.cartList.forEach((item, index) => {
 					if (item.checked) {
-						shangList.push(index)
+						shangList.push({productId:item.productId,num:item.productAmount})
 					}
 				})
 				// 如果没有勾选
-				if(shangList.length == 0){
+				if (shangList.length == 0) {
 					uni.showToast({
 						title: "请先勾选商品",
 						icon: 'error',
 						duration: 1000,
 					})
-				}else{
-				uni.navigateTo({
-					url: '../bookShop/settlement?type=1&list='+JSON.stringify(shangList)
-				});
+				} else {
+					uni.navigateTo({
+						url: '../bookShop/settlement?type=1&list=' + JSON.stringify(shangList)
+					});
 				}
 			},
-			
-			
+
+
 			// 商品内容跳转
 			goDetail(id) {
 				uni.navigateTo({
@@ -264,7 +298,7 @@
 		padding-top: 20rpx;
 
 		.cartItem {
-			padding: 10rpx 10rpx 10rpx 20rpx;
+			padding: 10rpx 10rpx 10rpx 10rpx;
 			margin-bottom: 20rpx;
 			display: flex;
 			align-items: center;
@@ -276,8 +310,8 @@
 				display: flex;
 
 				image {
-					width: 150rpx;
-					height: 180rpx;
+					width: 130rpx;
+					height: 150rpx;
 					border-radius: 10rpx;
 					padding: 10rpx;
 					margin-right: 15rpx;
@@ -359,4 +393,4 @@
 			}
 		}
 	}
-</style>
+</style>
\ No newline at end of file