twt 2 years ago
parent
commit
2722ad5523
3 changed files with 17 additions and 6 deletions
  1. 5 3
      pages/index/aboutUS.vue
  2. 9 1
      pages/index/index.vue
  3. 3 2
      pages/user/addCar/cailist.vue

+ 5 - 3
pages/index/aboutUS.vue

@@ -1,8 +1,9 @@
 <template>
 <view class="box">
-  <view class="contBox" v-html="detail">
+ <!-- <view class="contBox" v-html="detail">
   	
-  </view>
+  </view> -->
+  <rich-text :nodes="detail" style="background: #fff;"></rich-text>
 </view>
 </template>
 
@@ -35,7 +36,8 @@
 				    unionID:this.unionID
 				}, 'GET').then(res => {
 					uni.hideLoading();
-					this.detail = res.data
+					this.detail = res.data;
+					this.detail = this.detail.replace(/\<img/gi, '<img style="max-width:100%;height:auto" ');
 					//console.log('list+=', this.queryShopList);
 				
 				})

+ 9 - 1
pages/index/index.vue

@@ -954,7 +954,15 @@
 				   unionId:this.unionId
 				  },'GET').then(res => {
 					    uni.hideLoading();
-				 		this.homeCardList=res.data
+				 		this.homeCardList=res.data;
+						uni.setStorage({
+							key: 'openMCar',
+							data: res.data.openMCar,
+							 success: function () {
+							   that.getCarList()
+							 }
+						}); 
+						
 				  })
 			 },
 			 getShopinfo(num,shopId){

+ 3 - 2
pages/user/addCar/cailist.vue

@@ -19,7 +19,7 @@
 				</view>
 				<view class="lineBottom">
 					<view class="lineDel" @click.stop="editCar(item.id)">编辑</view>
-					<view class="lineDel" @click.stop="maintain(item)">保养信息</view>
+					<view class="lineDel" v-if="openMCar.showType==1" @click.stop="maintain(item)">保养信息</view>
 					<!-- <view class="Default" v-show="item.isDefault!=1" @click.stop="defaultCar(item)">设为默认</view>
 					<view class="DefaultYES" v-show="item.isDefault==1">已设为默认</view> -->
 				</view>
@@ -61,6 +61,7 @@
 				fromMe: false,
 				themeColor:'',
 				iStatusBarHeight:'',
+				openMCar:'',
 			}
 		},
 		onLoad(opt) {
@@ -70,7 +71,7 @@
 			// console.log(this.type)
 			this.fromMe = opt.fromMe
 			 this.themeColor = uni.getStorageSync("themeColor");
-
+            this.openMCar=uni.getStorageSync("openMCar");
 		},
 		onShow() {
 			this.getqueryMyBMemberCar();