修改大部分bug

components/page-component/goods/bd-detail.vue

@@ -5,7 +5,7 @@
 			<view class="detail-title">
 				<view class="detail-text" :class="{'active':tab==1}" @click="tab=1">图文详情</view>
 				<view class="detail-text" v-if="showTab"  :class="{'active':tab==2}" @click="tab=2">详细参数</view>
-				<view class="detail-text" v-if="showTab" :class="{'active':tab==3}" @click="tab=3">售后保障</view>
+				<view class="detail-text" v-if="showTab&&after_detail!=''" :class="{'active':tab==3}" @click="tab=3">售后保障</view>
 			</view>
             <app-rich-text v-if="tab==1"
                 :content="newDetail"
@@ -20,7 +20,7 @@
 					</view>
 				</view> 
 			</view> 
-			<app-rich-text v-if="tab==3"
+			<app-rich-text v-if="tab==3&&after_detail!=''" 
 			    :content="newAfterDetail"
 			></app-rich-text>
         </view>
@@ -39,7 +39,8 @@ export default {
 	data(){
 		return{
 			tab:1,
-			contrastList:null
+			contrastList:null,
+			showAfterDetail:true
 		}
 	},
     props: {

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

@@ -48,7 +48,7 @@
                                 </view>
                             </view> 
                         </view>  
-						<view class="service" v-if="service_screen&&service_screen.screenList&&service_screen.screenList.length>0">
+						<view class="service" v-if="enable_screen&&goods.service_screen&&service_screen.screenList&&service_screen.screenList.length>0">
 							<view class="service_title">全优汇服务</view>
 							<view class="service_item">
 								<image style="width: 26upx;height:26upx;" src="https://t12.9026.com/web/statics/icon1/sp.png"> </image>
@@ -144,6 +144,10 @@
                 type: Boolean,
                 default: true
             },
+			enable_screen:{
+				type: Boolean,
+				default: true
+			},
             leftText: {
                 type: String,
                 default: '加入购物车'

pages/order-submit/order-submit.vue

@@ -428,6 +428,7 @@ export default {
 		this.hasCancel=options.hasScreen==1? false:true;
 		console.log(416)
 		console.log(mchList)
+		this.hasCancel=mchList[0].hasScreen=1? false:true;
         let list = [];
         for(let item of mchList) {
             if(item.mch_id > 0) {

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

@@ -143,17 +143,30 @@
 			},
             pay() {
             	if (this.buttonDisabled) return;
-				if (this.$user.isLogin() && this.$store.state.user.info) {
-				    let  member_level =this.$store.state.user.info.identity.member_level;
-					if(member_level<this.detail.member_level){
-						uni.showToast({
-						    title: '您的会员等级未达到'+this.detail.member_name+',继续加油哟。。。',
-						    icon: 'none'
-						});
-						return;
-					}
-					
+			if (this.$user.isLogin() && this.$store.state.user.info) {
+			    let  member_level =this.$store.state.user.info.identity.member_level;
+				if(member_level<this.detail.member_level){
+					uni.showModal({
+						title:"提示",
+						content:"需达到"+this.detail.member_name+"会员才可购买",
+						showCancel:true,
+						buttonText: '升级',
+						success:(res)=>{
+							if (res.confirm) {
+							  uni.navigateTo({
+							  	// url:"/pages/member/index/index",
+								url: '/pages/member/upgrade/upgrade?level=' + member_level + '&other=' + this.detail.member_level
+							  })
+							} else if (res.cancel) {
+							  console.log('用户点击取消');
+							}
+			
+						}
+					})
+					return;
 				}
+				
+			}
 				let body = {
 					goods_id: this.detail.id,
 					goods_attr_id: 0,

plugins/advance/detail/detail.vue

@@ -161,6 +161,7 @@
 	import detailPriceShare from '../components/detail-price-share.vue';
 	import detailBottomButton from '../components/detail-bottom-button.vue';
 	import detailAttr from '../components/detail-attr.vue';
+	import uAttr from '../../../components/page-component/goods/u-attr.vue';
     import appJoinMember from '../../../components/page-component/app-join-member/app-join-member.vue';
 	import appGoodsService from '../../../components/page-component/goods/app-goods-service.vue'
     import appRelatedSuggestionProduct from '../../../components/page-component/app-related-suggestion-product/app-related-suggestion-product.vue';
@@ -386,6 +387,7 @@
 	        'detail-price-share': detailPriceShare,
 	        'detail-bottom-button': detailBottomButton,
 	        'detail-attr': detailAttr,
+			'uAttr':uAttr,
             'app-join-member': appJoinMember,
 	        'app-goods-service': appGoodsService,
             'app-related-suggestion-product': appRelatedSuggestionProduct,

plugins/book/goods/goods.vue

@@ -108,6 +108,7 @@
                 </view>
             </view>
             <u-attr
+				:enable_screen="false"
                 :goods="item"
                 v-model="show"
                 :theme-object="themeObject"

plugins/composition/detail/detail.vue

@@ -84,6 +84,34 @@
                     url: '/plugins/composition/index/index'
                 });
             },
+			isCanbuy(goods){
+				if (this.$user.isLogin() && this.$store.state.user.info) {
+				    let  member_level =this.$store.state.user.info.identity.member_level;
+					if(member_level<goods.member_level){
+						uni.showModal({
+							title:"提示",
+							content:"套餐中有商品"+goods.name+"不能购买,需达到"+goods.member_name+"会员才可购买",
+							showCancel:true,
+							buttonText: '升级',
+							success:(res)=>{
+								if (res.confirm) {
+								  uni.navigateTo({
+								  	// url:"/pages/member/index/index",
+									url: '/pages/member/upgrade/upgrade?level=' + member_level + '&other=' +goods.member_level
+								  })
+								  return false;
+								} else if (res.cancel) {
+								  console.log('用户点击取消');
+								  return true;
+								}
+				
+							}
+						})
+						return true;
+					}
+					
+				}
+			},
             toBuy() {
                 let that = this;
                 let attr = [];
@@ -95,6 +123,10 @@
                 ]
                 if(that.noAttrList.length > 0) {
                     that.showNoAttr = true;
+					for(let i in that.noAttrList) {
+					if(!that.isCanbuy(that.noAttrList[i]))
+						return;
+					}
                 }else {
                     for(let i in that.list) {
                         attr = [];
@@ -203,6 +235,7 @@
                                     list[0].goods_list.push(list[0].composition_list[j].goods_list[y])
                                 }
                             }
+							
                             let jump_url = `/pages/order-submit/order-submit?mch_list=${JSON.stringify(list)}`;
                             jump_url += `&preview_url=${encodeURIComponent(this.$api.composition.order_preview)}&submit_url=${encodeURIComponent(this.$api.composition.order_submit)}&plugin=composition`;
                             this.$jump({

plugins/pick/detail/detail.vue

@@ -125,6 +125,7 @@
                 </view>
             </view>
             <u-attr
+				:enable_screen="false"
                 v-model="attrShow"
                 :goods="detail"
                 :themeObject="themeObject"

plugins/step/goods/goods.vue

@@ -243,6 +243,30 @@
                 this.$set(this.goods.goods_coupon_center[index], 'is_receive', 1);
             },
             rightFunc(data) {
+				if (this.$user.isLogin() && this.$store.state.user.info) {
+					let member_level = this.$store.state.user.info.identity.member_level;
+					if (member_level < this.goods.member_level) {
+						uni.showModal({
+							title: "提示",
+							content: "需达到" + this.goods.member_name + "会员才可购买",
+							showCancel: true,
+							confirmText: '升级',
+							success: (res) => {
+								if (res.confirm) {
+									uni.navigateTo({
+										url: '/pages/member/upgrade/upgrade?level=' + member_level + '&other=' + this.goods.member_level
+				
+									})
+								} else if (res.cancel) {
+									console.log('用户点击取消');
+								}
+				
+							}
+						})
+						return;
+					}
+				
+				}
                 uni.navigateTo({
                     url: `/pages/order-submit/order-submit?mch_list=${JSON.stringify([data])}&preview_url=${encodeURIComponent(this.$api.step.order_preview)}&submit_url=${encodeURIComponent(this.$api.step.order_submit)}`
                 });

siteinfo.js

@@ -1,7 +1,9 @@
 var siteinfo = {
     'acid': -1,
     'version': '4.3.57',
-    '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;