皮肤修改

pages/index/index.vue

@@ -190,9 +190,9 @@
 							</view>
 						</view>
 						<view class="goodsPrice">
-							<view class="goodsPrice1">{{item.saleLabel}}</view>
-							<view class="goodsPrice2">￥</view>
-							<view class="goodsPrice3">{{item.salePrice}}
+							<view class="goodsPrice1" :style="{color:'#'+themeColor}">{{item.saleLabel}}</view>
+							<view class="goodsPrice2" :style="{color:'#'+themeColor}">￥</view>
+							<view class="goodsPrice3" :style="{color:'#'+themeColor}">{{item.salePrice}}
 							  <span v-if="item.categoryIds=='7B97D114-C419-42B2-9C1E-0B4CA284CDA0'">万</span>
 							</view>
 							<view class="goodsPrice4" v-if="item.showLabel&&item.scribingPrice&&item.showLabel.indexOf('1')!=-1">￥{{item.scribingPrice}}</view>

pages/index/onlineBooking.vue

@@ -83,13 +83,13 @@
 	        <img src="../../static/timg/icon_qingdan@2x.png" alt="" class="yyBleftimg">
 	      </view>
 	      <view>
-	        <view class="totalPriceBox"><span>预估总额:</span > <span class="totalPrice"><span class="qianhaospan">￥</span>{{totalPrice}}</span>  </view>
+	        <view class="totalPriceBox"><span>预估总额:</span > <span class="totalPrice" :style="{color:'#'+themeColor}"><span class="qianhaospan">￥</span >{{totalPrice}}</span>  </view>
 	        <span class="hejishul">合计数量: {{selectedItems.length}}</span>
 	      </view>
 	  
 	    </view>
 	  
-	    <view href="javascript:;" class=" newbottom-container-button" @click="yuyue">立即预约</view>
+	    <view href="javascript:;" :style="{background:'#'+themeColor}" class=" newbottom-container-button" @click="yuyue">立即预约</view>
 	  </view>
 	  
 	  <view class="yydetailBox" v-if="yydetailShow" @click="yydetailShow=false">
@@ -134,10 +134,12 @@
 				},
 				shopInfo:'',
 				naShopId:'',
+				themeColor:'',
 			}
 		},
 		onLoad(opt) {
 			this.userInfo = uni.getStorageSync("userInfo");
+			this.themeColor = uni.getStorageSync("themeColor");
 			this.naShopId=opt.naShopId;
 			if(this.naShopId == null ||this.naShopId == 'null' ){
 				this.naShopId=''

pages/shop/shop.vue

@@ -66,9 +66,9 @@
 						</view>
 	   				   <view class="hotGoodsLineRIghtBottom">
 	   				   	<view class="goodsPrice">
-	   				   		<view class="goodsPrice1">{{item.saleLabel}}</view>
-	   				   		<view class="goodsPrice2">￥</view>
-	   				   		<view class="goodsPrice3">{{item.salePrice?item.salePrice:item.scribingPrice}}
+	   				   		<view class="goodsPrice1" :style="{color:'#'+themeColor}">{{item.saleLabel}}</view>
+	   				   		<view class="goodsPrice2" :style="{color:'#'+themeColor}">￥</view>
+	   				   		<view class="goodsPrice3" :style="{color:'#'+themeColor}">{{item.salePrice?item.salePrice:item.scribingPrice}}
 	   				   		 <span v-if="item.categoryIds=='7B97D114-C419-42B2-9C1E-0B4CA284CDA0'">万</span>
 	   				   		</view>
 	   				   		<view class="goodsPrice4" v-if="item.showLabel&&item.scribingPrice">
@@ -139,6 +139,7 @@
 				inputChShow:false,
 				ext:'',
 				scrollTop:0,
+				themeColor:'',
 			}
 		},
 		  watch:{
@@ -159,6 +160,7 @@
 			}
 			this.userInfo=this.$store.state.userInfo;
 			this.wxOpenData=this.$store.state.wxOpenData;
+			this.themeColor = uni.getStorageSync("themeColor");
 			this.ext=this.$common.getExtStoreId();
 			this.getcategoryList();
 			this.getlistOpenGoodsPage();

pages/shop/wp.vue

@@ -1,8 +1,11 @@
 <template>
 	<view class="box">
-		<view style="padding-top: 100rpx;">
-			<canvas canvas-id="mini_poster" style="width: 600rpx;height: 817rpx;margin-left: 73rpx;"></canvas><!-- :style="{ width: canvasW + 'px', height: canvasH + 'px' }" -->
+		<view style="padding-top: 100rpx;padding-left: 73rpx;padding-right: 75rpx;">
+			<view style="border-radius: 20rpx;">
+				<canvas canvas-id="mini_poster" style="width: 600rpx;"  :style="{  height: canvasH + 'px' }"></canvas><!-- :style="{ width: canvasW + 'px', height: canvasH + 'px' }" -->
+			</view>
 		</view>
+	
 		<view style="height: 106rpx;"></view>
 		<!-- <view class="footer">
 			<view style="height: 106rpx; align-items: center; background-color: #333333;">
@@ -67,7 +70,12 @@
 			this.userInfo=this.$store.state.userInfo;
 			this.ext=this.$common.getExtStoreId();
 			this.canvasW =uni.upx2px(600)
-			this.canvasH = uni.upx2px(827)
+			if(this.sellingPoint){
+				this.canvasH = uni.upx2px(817)
+			}else{
+				this.canvasH = uni.upx2px(717)
+			}
+			
 			var that=this;
 			var type=opt.type
 			if(type==2){
@@ -156,7 +164,10 @@
 				const cw = this.canvasW - 2 * padding
 
 				let ctx = uni.createCanvasContext('mini_poster', this)
-
+                // 左上角
+				var cx =  uni.upx2px(30)
+				var cy =  uni.upx2px(30)
+               // ctx.arc(this.canvasW, 0, this.canvasW,this.canvasH, cx)
 				// 透明背景
 				// ctx.setFillStyle('rgba(255, 255, 255, 0)')
 				ctx.setFillStyle('#FFFFFF')
@@ -186,6 +197,7 @@
 					 //var filePath='../../static/timg/CS.png'
 					  var times = new Date().getTime();
 					var codeimg = wx.env.USER_DATA_PATH + '/' + times + '.png';
+					var that=this;
 					 fsm.writeFile({
 						 filePath: codeimg, // 要写入的文件路径 (本地路径)
 						 data: this.mpWxQr3, // 要写入的文本或二进制数据
@@ -193,9 +205,14 @@
 						 success(e) {
 							 console.log(e)
 							 console.log(codeimg)
-							 var wxsx=uni.upx2px(68)
-							 var wxsy=uni.upx2px(649)
-							 var wxwidth=uni.upx2px(148)
+							 var wxsx=uni.upx2px(48)
+							 if(that.sellingPoint){
+							 	 var wxsy=uni.upx2px(649)
+							 }else{
+							 	 var wxsy=uni.upx2px(549)
+							 }
+							
+							 var wxwidth=uni.upx2px(158)
 							 ctx.drawImage(codeimg, wxsx, wxsy, wxwidth,wxwidth)
 						 },
 						 fail(err) {
@@ -261,7 +278,12 @@
 				
 				var wemtis1='名额有限 先到先得'
 				var wemtisx=uni.upx2px(240)
-				var wemtisy=uni.upx2px(700)
+				if(this.sellingPoint){
+					var wemtisy=uni.upx2px(700)
+				}else{
+					var wemtisy=uni.upx2px(600)
+				}
+				
 				ctx.setFillStyle('#999999')
 				const fz24 = uni.upx2px(24)
 				ctx.setFontSize(fz24)
@@ -358,7 +380,12 @@
 				ctx.clip()
 				// draw left border
 				ctx.fillStyle = '#EEEEEE'
-				var y=uni.upx2px(619)
+				if(this.sellingPoint){
+					var y=uni.upx2px(619)
+				}else{
+					var y=uni.upx2px(519)
+				}
+				
 				var bWidth=uni.upx2px(600)
 			    ctx.fillRect(0, y, bWidth, 2)
 				ctx.restore()