Merge branch 'master' of http://gitlab.oytour.com/zk123/jz_travel into master

components/goods/style1.vue

@@ -45,7 +45,7 @@
 						<view>
 							<span class="price">
 								<span style="font-size: 28rpx;font-weight: 500;margin-right: 2rpx;">￥</span>
-								{{ goodsInfo.showGoodsPrice ? getPrice(item.price) : '' }}
+								{{ goodsInfo.showGoodsPrice ? getPrice(item.OriginalPrice) : '' }}
 							</span>
 						</view>
 					</view>

components/goods/style2.vue

@@ -39,7 +39,7 @@
 						</view> -->
 						<view class="good-price-info">
 							<view class="price">
-								{{ goodsInfo.showGoodsPrice ? getPrice(item.price) : '' }}
+								{{ goodsInfo.showGoodsPrice ? getPrice(item.OriginalPrice) : '' }}
 								<!-- <span style='text-decoration: line-through;margin-left: 10px;font-size: 10px;color: gray;font-family: aa;'>原价:{{goodsInfo.showGoodsPrice ? getPrice(item.OriginalPrice) : ''}}</span> -->
 							</view>
 							<view class="buy" v-if="goodsInfo.showBuyBtn" @click.stop="showSkuHandler(item)">

components/goods/style3.vue

@@ -48,7 +48,7 @@
             <div class="good-price-info">
               <view class="price" :style="{ color: mainColor }">
                 <span>{{
-                  goodsInfo.showGoodsPrice ? getPrice(item.price) : ""
+                  goodsInfo.showGoodsPrice ? getPrice(item.OriginalPrice) : ""
                 }}</span>
                 <span
                   style="

components/goods/style4.vue

@@ -36,7 +36,7 @@
         }}</view>
         <view class="good-price-info">
           <view class="price" :style="{ color: mainColor }">{{
-            goodsInfo.showGoodsPrice ? getPrice(item.price) : ""
+            goodsInfo.showGoodsPrice ? getPrice(item.OriginalPrice) : ""
           }}</view>
           <view
             class="buy"

components/goods/style5.vue

@@ -44,7 +44,7 @@
               item.thirdname
             }}</view>
             <span>
-              {{ goodsInfo.showGoodsPrice ? getPrice(item.price) : "" }}
+              {{ goodsInfo.showGoodsPrice ? getPrice(item.OriginalPrice) : "" }}
             </span>
             <!-- <span style='text-decoration: line-through;font-size: 10px;color: gray;font-family: aa;'>原价:{{goodsInfo.showGoodsPrice ? getPrice(item.OriginalPrice) : ''}}</span> -->
           </view>

components/goods/style6.vue

@@ -41,7 +41,7 @@
         }}</view>
         <view class="good-price-info">
           <view class="price" :style="{ color: mainColor }"
-            >{{ goodsInfo.showGoodsPrice ? getPrice(item.price) : "" }}
+            >{{ goodsInfo.showGoodsPrice ? getPrice(item.OriginalPrice) : "" }}
             <!-- <span style='text-decoration: line-through;margin-left: 10px;font-size: 10px;color: gray;font-family: aa;'>原价:{{goodsInfo.showGoodsPrice ? getPrice(item.OriginalPrice) : ''}}</span> -->
           </view>
           <view

components/goods/style7.vue

@@ -112,7 +112,7 @@
             class="price"
             :style="{ color: mainColor }"
             v-if="item.price > 0 && goodsInfo.showGoodsPrice"
-            >{{ goodsInfo.showGoodsPrice ? getPrice(item.price) : "" }}
+            >{{ goodsInfo.showGoodsPrice ? getPrice(item.OriginalPrice) : "" }}
             <span
               style="
                 text-decoration: line-through;

pages/jiuzhai/jz_Reserve.vue

@@ -621,18 +621,18 @@ export default {
         this.submit = true;
         this.userInfo = uni.getStorageSync("mall_UserInfo");
         this.basedataObj = uni.getStorageSync("basedata").mall;
-        var CustomerId = 0;
+        var CustomerId = this.basedataObj.virtualB2BCustomerId;
         var ContactName = this.contactName;
         var ContactMobile = this.contactMobile;
-        var CustomerType = 3;
-        var price = 0;
-        if (this.$utils.getretailer()) {
-          CustomerId = this.basedataObj.virtualB2BCustomerId;
-          CustomerType = 1;
-          price = this.currentPriceInfo.b2BMemberPrice;
-        } else {
-          price = this.currentPriceInfo.b2CMemberPrice;
-        }
+        var CustomerType = 4;
+        var price = this.currentPriceInfo.b2CPrice;
+        // if (this.$utils.getretailer()) {
+        //   CustomerId = this.basedataObj.virtualB2BCustomerId;
+        //   CustomerType = 4;
+        //   price = this.currentPriceInfo.b2BMemberPrice;
+        // } else {
+        //   price = this.currentPriceInfo.b2CMemberPrice;
+        // }
         let msg = {
           OrderId: 0,
           TCID: this.currentPriceInfo.tcid,