开发

ghsApp/dist/build/mp-weixin/admin/clear/orderItem.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/admin/home/components/module/operate.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/app-coupon-sel.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/app-uploader.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/module/allMoreSelectInput.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/module/app-avatar.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/module/app-close.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/module/app-vip.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/plugin/fab.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/plugin/list-cell.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/plugin/modal.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/pagesClient/member/detail.wxss

@@ -1,9 +1,9 @@
-.module-com.data-v-084dfd7a{margin:0 30rpx 20rpx;padding:20rpx;background-color:#fff;border-radius:10rpx;position:relative;z-index:10}.user-info.data-v-084dfd7a{padding:60rpx 20rpx 60rpx;position:relative;top:51rpx}.user-info .user-info_top.data-v-084dfd7a{position:relative;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;height:100rpx}.user-info .user-info_top .user-info_lf.data-v-084dfd7a{position:relative;padding-left:10rpx;-webkit-box-flex:1;-webkit-flex:1;flex:1}.user-info .user-info_top .user-info_lf .avatar.data-v-084dfd7a{position:absolute;left:10rpx;top:50%;-webkit-transform:translateY(-50%);transform:translateY(-50%)}.user-info .user-info_top .user-info_lf .dec-bx.data-v-084dfd7a{padding-left:130rpx}.user-info .user-info_top .user-info_lf .dec-bx > view.data-v-084dfd7a:nth-child(1){color:#333;font-size:36rpx;margin-bottom:3rpx}.user-info .user-info_top .user-info_lf .dec-bx > view.data-v-084dfd7a:nth-child(2){color:#666;font-size:30rpx}.user-info .user-info_top .already-shop.data-v-084dfd7a{color:#09bb07;font-size:30rpx;font-weight:400}.user-info .user-info_top .already-shop > .iconfont.data-v-084dfd7a{padding-right:8rpx;font-size:32rpx}.invite-bt.data-v-084dfd7a{color:#fff;font-size:26rpx;font-weight:400;width:140rpx;height:50rpx;line-height:50rpx;background-color:#3385ff;text-align:center;border-radius:25rpx;border:1rpx solid #ddd;padding:0;-webkit-user-select:none;user-select:none;outline:none}.invite-bt.white.data-v-084dfd7a{background-color:#fff;color:#666}.total-wrap .total-tit.data-v-084dfd7a,
-.order-wrap .total-tit.data-v-084dfd7a{padding:18rpx 0 18rpx 20rpx;border-bottom:1rpx solid #eee;font-weight:600;font-size:24rpx;color:#333}.total-wrap .total-blo.data-v-084dfd7a,
-.order-wrap .total-blo.data-v-084dfd7a{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;-webkit-flex-wrap:wrap;flex-wrap:wrap;padding:30rpx 0 0rpx}.total-wrap .total-blo .total-list.data-v-084dfd7a,
-.order-wrap .total-blo .total-list.data-v-084dfd7a{width:33%;text-align:center;margin:20rpx 0rpx;border-right:1rpx solid #eee}.total-wrap .total-blo .total-list .app-color-3.data-v-084dfd7a,
-.order-wrap .total-blo .total-list .app-color-3.data-v-084dfd7a{font-size:24rpx}.total-wrap .total-blo .total-list .list-num.data-v-084dfd7a,
-.order-wrap .total-blo .total-list .list-num.data-v-084dfd7a{margin-top:8rpx;margin-bottom:8rpx;font-size:36rpx;font-weight:700}.total-wrap .total-blo .total-list .list-num.color-blue.data-v-084dfd7a,
-.order-wrap .total-blo .total-list .list-num.color-blue.data-v-084dfd7a{color:#3385ff}.total-wrap .total-blo .total-list.data-v-084dfd7a:nth-child(3n),
-.order-wrap .total-blo .total-list.data-v-084dfd7a:nth-child(3n){border-right:none}.total-wrap .total-blo .total-list.data-v-084dfd7a:nth-child(n + 4),
-.order-wrap .total-blo .total-list.data-v-084dfd7a:nth-child(n + 4){padding-bottom:0}.user-address_bx.data-v-084dfd7a{margin-top:70rpx;padding:20rpx 0}.user-address_bx .address-tit.data-v-084dfd7a{color:#999;font-size:24rpx;font-weight:600;padding:10rpx 0 20rpx 20rpx;border-bottom:1rpx solid #eee}.user-address_bx .address-des_bx.data-v-084dfd7a{display:-webkit-box;display:-webkit-flex;display:flex;padding:20rpx 10rpx 30rpx 20rpx}.user-address_bx .address-des_bx > view.data-v-084dfd7a:nth-child(1){-webkit-box-flex:1;-webkit-flex:1;flex:1;margin-top:10rpx}.user-address_bx .address-des_bx > view:nth-child(1) > view.data-v-084dfd7a:nth-child(1){color:#333;font-size:28rpx;font-weight:700;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.user-address_bx .address-des_bx > view:nth-child(1) > view:nth-child(1) .admin-button-com.data-v-084dfd7a{margin-left:10rpx;border-radius:25rpx}.user-address_bx .address-des_bx > view:nth-child(1) > view.data-v-084dfd7a:nth-child(2){color:#666;font-size:28rpx;font-weight:400;margin-top:20rpx}.user-address_bx .address-des_bx > view.data-v-084dfd7a:nth-child(2){display:-webkit-box;display:-webkit-flex;display:flex}.user-address_bx .address-des_bx > view:nth-child(2) .icondianhua1.data-v-084dfd7a{font-size:44rpx;color:#3385ff;margin-left:10rpx}.user-open_bx.data-v-084dfd7a{margin-top:20rpx;padding:0}.user-open_bx .switch_bx.data-v-084dfd7a{-webkit-box-flex:1;-webkit-flex:1;flex:1;text-align:right}.user-open_bx .switch_bx > text.data-v-084dfd7a{color:#999;font-size:28rpx;display:inline-block;margin-right:22rpx}
+.module-com.data-v-5ebcd26e{margin:0 30rpx 20rpx;padding:20rpx;background-color:#fff;border-radius:10rpx;position:relative;z-index:10}.user-info.data-v-5ebcd26e{padding:60rpx 20rpx 60rpx;position:relative;top:51rpx}.user-info .user-info_top.data-v-5ebcd26e{position:relative;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;height:100rpx}.user-info .user-info_top .user-info_lf.data-v-5ebcd26e{position:relative;padding-left:10rpx;-webkit-box-flex:1;-webkit-flex:1;flex:1}.user-info .user-info_top .user-info_lf .avatar.data-v-5ebcd26e{position:absolute;left:10rpx;top:50%;-webkit-transform:translateY(-50%);transform:translateY(-50%)}.user-info .user-info_top .user-info_lf .dec-bx.data-v-5ebcd26e{padding-left:130rpx}.user-info .user-info_top .user-info_lf .dec-bx > view.data-v-5ebcd26e:nth-child(1){color:#333;font-size:36rpx;margin-bottom:3rpx}.user-info .user-info_top .user-info_lf .dec-bx > view.data-v-5ebcd26e:nth-child(2){color:#666;font-size:30rpx}.user-info .user-info_top .already-shop.data-v-5ebcd26e{color:#09bb07;font-size:30rpx;font-weight:400}.user-info .user-info_top .already-shop > .iconfont.data-v-5ebcd26e{padding-right:8rpx;font-size:32rpx}.invite-bt.data-v-5ebcd26e{color:#fff;font-size:26rpx;font-weight:400;width:140rpx;height:50rpx;line-height:50rpx;background-color:#3385ff;text-align:center;border-radius:25rpx;border:1rpx solid #ddd;padding:0;-webkit-user-select:none;user-select:none;outline:none}.invite-bt.white.data-v-5ebcd26e{background-color:#fff;color:#666}.total-wrap .total-tit.data-v-5ebcd26e,
+.order-wrap .total-tit.data-v-5ebcd26e{padding:18rpx 0 18rpx 20rpx;border-bottom:1rpx solid #eee;font-weight:600;font-size:24rpx;color:#333}.total-wrap .total-blo.data-v-5ebcd26e,
+.order-wrap .total-blo.data-v-5ebcd26e{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;-webkit-flex-wrap:wrap;flex-wrap:wrap;padding:30rpx 0 0rpx}.total-wrap .total-blo .total-list.data-v-5ebcd26e,
+.order-wrap .total-blo .total-list.data-v-5ebcd26e{width:33%;text-align:center;margin:20rpx 0rpx;border-right:1rpx solid #eee}.total-wrap .total-blo .total-list .app-color-3.data-v-5ebcd26e,
+.order-wrap .total-blo .total-list .app-color-3.data-v-5ebcd26e{font-size:24rpx}.total-wrap .total-blo .total-list .list-num.data-v-5ebcd26e,
+.order-wrap .total-blo .total-list .list-num.data-v-5ebcd26e{margin-top:8rpx;margin-bottom:8rpx;font-size:36rpx;font-weight:700}.total-wrap .total-blo .total-list .list-num.color-blue.data-v-5ebcd26e,
+.order-wrap .total-blo .total-list .list-num.color-blue.data-v-5ebcd26e{color:#3385ff}.total-wrap .total-blo .total-list.data-v-5ebcd26e:nth-child(3n),
+.order-wrap .total-blo .total-list.data-v-5ebcd26e:nth-child(3n){border-right:none}.total-wrap .total-blo .total-list.data-v-5ebcd26e:nth-child(n + 4),
+.order-wrap .total-blo .total-list.data-v-5ebcd26e:nth-child(n + 4){padding-bottom:0}.user-address_bx.data-v-5ebcd26e{margin-top:70rpx;padding:20rpx 0}.user-address_bx .address-tit.data-v-5ebcd26e{color:#999;font-size:24rpx;font-weight:600;padding:10rpx 0 20rpx 20rpx;border-bottom:1rpx solid #eee}.user-address_bx .address-des_bx.data-v-5ebcd26e{display:-webkit-box;display:-webkit-flex;display:flex;padding:20rpx 10rpx 30rpx 20rpx}.user-address_bx .address-des_bx > view.data-v-5ebcd26e:nth-child(1){-webkit-box-flex:1;-webkit-flex:1;flex:1;margin-top:10rpx}.user-address_bx .address-des_bx > view:nth-child(1) > view.data-v-5ebcd26e:nth-child(1){color:#333;font-size:28rpx;font-weight:700;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.user-address_bx .address-des_bx > view:nth-child(1) > view:nth-child(1) .admin-button-com.data-v-5ebcd26e{margin-left:10rpx;border-radius:25rpx}.user-address_bx .address-des_bx > view:nth-child(1) > view.data-v-5ebcd26e:nth-child(2){color:#666;font-size:28rpx;font-weight:400;margin-top:20rpx}.user-address_bx .address-des_bx > view.data-v-5ebcd26e:nth-child(2){display:-webkit-box;display:-webkit-flex;display:flex}.user-address_bx .address-des_bx > view:nth-child(2) .icondianhua1.data-v-5ebcd26e{font-size:44rpx;color:#3385ff;margin-left:10rpx}.user-open_bx.data-v-5ebcd26e{margin-top:20rpx;padding:0}.user-open_bx .switch_bx.data-v-5ebcd26e{-webkit-box-flex:1;-webkit-flex:1;flex:1;text-align:right}.user-open_bx .switch_bx > text.data-v-5ebcd26e{color:#999;font-size:28rpx;display:inline-block;margin-right:22rpx}

ghsApp/dist/build/mp-weixin/pagesInvite/inviteItem.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/pagesOrder/components/stepStatus.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

hdApp/dist/build/mp-weixin/admin/coupon/components/selectCouponItem.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

hdApp/dist/build/mp-weixin/admin/home/components/module/operate-line.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

hdApp/dist/build/mp-weixin/admin/home/components/module/operate.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

hdApp/dist/build/mp-weixin/admin/home/components/plugin/time-axis.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

hdApp/dist/build/mp-weixin/admin/home/components/plugin/timeaxis-item.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

hdApp/dist/build/mp-weixin/admin/order/components/card-name.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

hdApp/dist/build/mp-weixin/components/app-date-picker.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

hdApp/dist/build/mp-weixin/components/app-img.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/components/app-result.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/components/module/app-close.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/components/module/app-footer-cart.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

hdApp/dist/build/mp-weixin/components/module/app-goods-commodity-style.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

hdApp/dist/build/mp-weixin/components/module/app-order-list.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/components/module/app-share-mask.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

hdApp/dist/build/mp-weixin/components/module/app-vip.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/components/plugin/badge.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

hdApp/dist/build/mp-weixin/components/plugin/bottom-popup.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/components/plugin/list-cell.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/components/plugin/number-box.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/components/plugin/rate.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/components/plugin/simple-address.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/components/plugin/t-table/t-table.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/components/plugin/t-table/t-td.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/components/plugin/t-table/t-th.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/components/plugin/t-table/t-tr.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/components/plugin/tabs.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

hdApp/dist/build/mp-weixin/pagesArrears/detailsItem.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

hdApp/dist/build/mp-weixin/pagesInvite/inviteItem.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

hdApp/dist/build/mp-weixin/pagesOrder/components/stepStatus.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

hdApp/src/components/module/app-commodity.vue

@@ -7,12 +7,18 @@
 			<view class="tit" >{{ info.itemName || "" }}</view>
 			<view class="kc num-open_bx flex-space" v-if="type == COMMODITY_TYPE.COMMON">
 				<view v-if="!offPrice">
-					<view class="flex-space" style="margin-bottom: 50rpx;margin-top:15rpx" v-if="Number(info.discountPrice)>0">
-						<view style="padding:3rpx 10rpx 3rpx 10rpx;text-align: center;color: red;border: 1px solid red;margin-right: 20rpx;line-height: 1;font-size: 20rpx">
+					<view class="flex-space" style="margin-top:8rpx" v-if="Number(info.discountPrice)>0">
+						<view style="padding:2rpx 10rpx 5rpx 10rpx;text-align: center;color: red;border: 1px solid red;margin-right: 20rpx;line-height: 1;font-size: 20rpx">
 							{{((Number(info.discountPrice)/Number(info.prePrice)).toFixed(2)*10).toFixed(1)+'折'}}
 						</view>
 						<text style="text-decoration:line-through;color:#A9A9A9">¥{{info.prePrice}}</text>
 					</view>
+					
+					<view v-if="discount < 1 && discount >0">
+					<text v-if="Number(info.discountPrice)>0">预估到手 {{parseFloat((Number(info.discountPrice)*Number(discount)).toFixed(2))}}</text>
+					<text v-else>预估到手 {{parseFloat((Number(info.price)*Number(discount)).toFixed(2))}}</text>
+					</view>
+
 					<view v-if="Number(info.discountPrice)>0" class="price" >￥{{ info.discountPrice }}</view>
 					<view v-else class="price" >￥{{ info.price }}</view>
 				</view>
@@ -32,7 +38,6 @@
 			<view class="num-open_bx flex-space" v-if="type == COMMODITY_TYPE.CHANGE">
 				<view class="price" v-if="!offPrice">￥{{ showPrice }}</view>
 				<view class="price" v-else></view>
-
 				<view class="open-bx" style="padding-bottom: 40rpx" >
 					<allSelectInput :inputType="'digit'" :isActive="isAloneAllActive" :isFocus="isAloneAllFocus" :value="changeAutoPrice" :placeholder="'自动调价'"
 									@deleteInputVal="deleteInputVal" @initAllInput="initAloneAllInput" @moveAllInput="moveAllInput">
@@ -82,6 +87,10 @@ export default {
 			type: Number,
 			default: 0
 		},
+		discount:{
+			type: Number,
+			default: 1
+		},
 		autoPrice: {},
 		offPrice: {
 			type: Boolean,
@@ -232,10 +241,10 @@ export default {
 		padding-left: 160px;
 		padding-bottom: 30rpx;
 		& .tit {
-			font-size: 32px;
+			font-size: 30px;
 			font-weight: 700;
 			color: #333333;
-			padding-top: 2rpx 0 2rpx 0;
+			padding-top: 0 0 2rpx 0;
 		}
 		& .kc {
 			position: relative;
@@ -246,7 +255,6 @@ export default {
 				left: 0;
 				bottom: 0;
 			}
-			//padding: 8px 0 24px;
 		}
 		& .num-open_bx {
 			display: flex;
@@ -255,6 +263,8 @@ export default {
 				font-size: 28px;
 				color: #ff2842;
 				flex: 1;
+				top:72rpx;
+				font-weight:550;
 			}
 			& .open-bx {
 				display: flex;
@@ -264,7 +274,6 @@ export default {
 					color: #3385ff;
 					font-size: 42px;
 				}
-
 				.position{
 					display: block;
 					width: 70rpx;

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -8,7 +8,7 @@
           <view class="shop_title">{{pageInfo.name}}</view>
           <view class="shop_intro">
 			  <text v-if="pageInfo.giveDiscount >= 1" style="margin-right: 20upx;">已采购：{{pageInfo.expendAmount || '0.00'}}</text>
-			  <text v-else style="margin-right: 20upx;color:red;font-weight:700">下单享{{pageInfo.giveDiscount*100}}折</text>
+			  <text v-else style="margin-right: 20upx;color:red;font-weight:700">下单享{{shareDiscount}}折</text>
 			  <text>欠款：{{pageInfo.debtAmount || '0.00'}}</text></view>
         </view>
         <i class="iconfont icondianhua1" v-if="pageInfo.mobile !=''" @tap="toPhone(pageInfo.mobile)"></i>
@@ -48,6 +48,7 @@
 									:offVerifyRepertory="true"
 									:bigCount="getSelectItemById(productItem.id, classItem.classId).bigCount"
 									:smallCount="getSelectItemById(productItem.id, classItem.classId).smallCount"
+									:discount.sync="pageInfo.giveDiscount"
 									@customNum="customNum"
 									@add="addEvent"
 									@addOneEvent="addCustomNumEvent"
@@ -157,7 +158,8 @@ export default {
 			shopId:0,
 			infoData:{},
 			xjData:{},
-			xjDataInfo:{}
+			xjDataInfo:{},
+			shareDiscount:1
 		};
 	},
 	onPullDownRefresh() {
@@ -309,21 +311,27 @@ export default {
 			this.initGhsData(id,shopId);
 
 			if(this.option.id == 0) {
-				return ghsInfo({shopId: this.option.shopId}).then(res => {
+				ghsInfo({shopId: this.option.shopId}).then(res => {
 					this.pageInfo = res.data
+					this.createShareDiscount()
 					uni.setNavigationBarTitle({title: this.pageInfo.name})
 					this.option.id = res.data.id;
 				}).catch(err => {})
 			} else {
-				return getGhsDataApi({id: this.option.id}).then(res => {
+				getGhsDataApi({id: this.option.id}).then(res => {
 					this.pageInfo = res.data
 					this.shopId = res.data.shopId
+					this.createShareDiscount()
 					uni.setNavigationBarTitle({
 						title: this.pageInfo.name
 					})
 				}).catch(err => {})
 			}
 		},
+		createShareDiscount(){
+			let shareDiscount = this.pageInfo.giveDiscount*100
+			this.shareDiscount = shareDiscount
+		},
 		scroll_detail(options){
 			if(options.detail.scrollTop > 20) {
 				this.myClass = 'fadeOut'