修复预售碎屏险

components/page-component/goods/u-attr.vue

@@ -3,23 +3,24 @@
 		<view @click="turnOn">
 			<slot name="btn"></slot>
 		</view>
-		<u-popup v-model="newValue" mode="bottom" border-radius="14" :safeAreaInsetBottom="true" @close="close">
-			<view class="u-model" @touchmove.stop.prevent>
+		<u-popup v-model="newValue" :custom-style="!is_yushou?is_yu:is_shou" :mask="is_yushou" mode="bottom" border-radius="14" :safeAreaInsetBottom="true" @close="close">
+			<view class="u-model" @touchmove.stop.prevent :style="!is_yushou?'position:fixed;bottom:0;background:#fff':''">
 				<view class="u-top dir-left-nowrap u-border-box">
 					<view class="u-pic u-border-box" @click="clickImg(imgUrl)">
 						<image class="u-img" :src="imgUrl"></image>
 					</view>
 					<view class="u-info">
 						<view :class="['cross-center', 'dir-left-nowrap', themeObject.color]">
-							<view class="dir-left-nowrap">
-								<slot name="priceBefore"></slot>
-								<view class="u-price">
-									<app-price v-if="is_show_price" :theme="themeObject.theme"
+							<view class="">
+								<slot name="priceBefore"></slot>
+								<text v-if="!is_yushou" style="font-size: 24rpx;" :class="theme+ '-m-text ' + theme">定金￥{{attr_deposit}}抵￥{{attr_swell_deposit}}</text>
+								<view class="u-price" style="display: flex;align-items: center;">
+									<app-price v-if="is_show_price" style="margin-right: 12rpx;" :theme="themeObject.theme"
 										:userTheme="themeObject.userTheme" :sign="sign" :price="sellPrice"
-										:default-price="goods.price"></app-price>
+										:default-price="goods.price"></app-price>
+										<app-member-mark v-if="goods.level_show === 1" :theme="themeObject"></app-member-mark>
 								</view>
 							</view>
-							<app-member-mark v-if="goods.level_show === 1" :theme="themeObject"></app-member-mark>
 						</view>
 						<view class="u-stock">库存：{{stock}}</view>
 					</view>
@@ -79,7 +80,7 @@
 						</view>
 					</scroll-view>
 				</view>
-				<view class="u-bottom dir-left-nowrap">
+				<view class="u-bottom dir-left-nowrap" v-if="is_yushou">
 					<view v-if="is_show_left && (goods.type === 'goods' || is_must_left)" class="box-grow-1"
 						:class="cartClass" @click="leftSubmit">
 						<slot name="left_slot"></slot>
@@ -109,7 +110,9 @@
 
 	export default {
 		name: "u-attr",
-		props: {
+		props: {
+			attr_swell_deposit: String,
+			attr_deposit: String,
 			value: {
 				type: Boolean
 			},
@@ -165,7 +168,12 @@
 			is_gift: {
 				type: Boolean,
 				default: false
-			}
+			},
+			is_yushou: {
+				type: Boolean,
+				default: true
+			},
+			height:Number
 		},
 		data() {
 			return {
@@ -178,7 +186,13 @@
 				serviceId: null, //碎屏险ID
 				card_id: null,
 				screenDescription: '',
-				shopgoods: {}
+				shopgoods: {},
+				is_yu:{
+					marginBottom:'110rpx'
+				},
+				is_shou:{
+					
+				}
 			}
 		},
 		methods: {
@@ -615,7 +629,7 @@
 				if (!this.goods) return;
 				return this.$utils.deepClone(this.goods.attr);
 			},
-			cartClass: function() {
+			cartClass: function() {
 				console.log(this.themeObject)
 				if (!this.$slots.left_slot) {
 					if (this.themeObject.theme === 'a' || this.themeObject.theme === 'b' || this.themeObject.theme ===
@@ -697,7 +711,7 @@
 	.u-info {
 		width: 424upx;
 		height: 136upx;
-		padding: 45upx 0 0 24upx;
+		padding: 10upx 0 0 24upx;
 	}
 
 	.u-scroll-view {

plugins/advance/components/detail-bottom-button.vue

@@ -155,6 +155,7 @@
 				});
 			},
             pay() {
+				console.log("hahhaa")
             	if (this.buttonDisabled) return;
 			if (this.$user.isLogin() && this.$store.state.user.info) {
 			    let  member_level =this.$store.state.user.info.identity.member_level;

plugins/advance/detail/detail.vue

@@ -82,7 +82,10 @@
                 :goods-stock="detail.goods_stock"
                 @openAttr="active = false"
             ></bd-xbc>
-            <detail-attr
+			<u-attr v-model="!active && detail.attr.length>0" :checked="attrGoods.select" :goods="detail"
+				:theme-object="themeObject" @check="checkClick" @input="close" :is_yushou="false" :attr_deposit="attr_deposit"
+                :attr_swell_deposit="attr_swell_deposit" :height="110"></u-attr>
+          <!-- <detail-attr
                 v-if="!active && detail.attr.length>0"
                 v-bind:theme="getTheme"
                 v-bind:height="110"
@@ -103,7 +106,7 @@
                 v-bind:detail="detail"
                 @change_num="change_num"
                 @change_num_data="change_num_data"
-            ></detail-attr>
+            ></detail-attr> -->
             <bd-hc
                 :integral="detail.goods_marketing_award.integral"
                 :coupon="detail.goods_marketing_award.coupon"
@@ -178,7 +181,6 @@
     import bdHc from '@/components/page-component/goods/bd-hc.vue';
     import bdCoupon from '@/components/page-component/goods/bd-coupon.vue';
     import bdXbc from '@/components/page-component/goods/bd-xbc.vue';
-
     export default {
         name: "detail",
 	    data() {
@@ -211,6 +213,11 @@
 				buttonDisabled: false,
                 poster_config: this.$api.advance.poster_config,
                 poster_generate: this.$api.advance.poster_generate,
+				attrGoods: {
+					goods: null,
+					attrShow: 0,
+					select: null
+				}
             }
 	    },
 		onLoad(data) {
@@ -252,6 +259,10 @@
             clearInterval(this.end_time);
         },
 	    methods: {
+			checkClick(select) {
+				console.log(this.attrGoods,">>>>>>>>>>>>>>>>>>>>")
+				this.attrGoods.select = select;
+			},
             getMall(e) {
                 this.is_open = e.is_open;
             },
@@ -265,6 +276,7 @@
                 }).then(res => {
                     if (res.code === 0) {
                         this.detail = res.data.detail;
+						console.log(this.detail,">>>>>>++++++++++++")
                         if (this.detail.goods_activity) {
                             this.full_reduce = this.detail.goods_activity.full_reduce;
                         }
@@ -351,8 +363,12 @@
                 this.attr_stock == 0 ? this.buttonDisabled = true : this.buttonDisabled = false;
 		    },
             close_attr(data) {
+				console.log(data)
                 this.active = data;
             },
+			close(data){
+				this.active = !data
+			},
 		    getTime(end_prepayment_at) {
                 let time = new Date(end_prepayment_at.replace(/-/g, '/')).getTime() - (new Date()).getTime();
                 this.d = parseInt((time/1000/60/60/24));

siteinfo.js

@@ -1,9 +1,9 @@
 var siteinfo = {
     'acid': -1,
     'version': '4.3.57',
-	// 'siteroot': 'https://t12.9026.com/app/index.php',
-	// 'apiroot': 'https://t12.9026.com/web/index.php?_mall_id=21989',
-    'siteroot': 'https://quanyouhui.9026.com/app/index.php',
-    'apiroot': 'https://quanyouhui.9026.com/web/index.php?_mall_id=21989',
+	'siteroot': 'https://t12.9026.com/app/index.php',
+	'apiroot': 'https://t12.9026.com/web/index.php?_mall_id=21989',
+    // 'siteroot': 'https://quanyouhui.9026.com/app/index.php',
+    // 'apiroot': 'https://quanyouhui.9026.com/web/index.php?_mall_id=21989',
 };
 module.exports = siteinfo;