合并

pagesHome/order/appraise.vue

@@ -299,7 +299,7 @@
 				align-items: flex-start;
 				background-color: var(--mainColor);
 				margin: 0 0 2vw 0;
-				padding: 4vw;
+				padding: 2vw;
 
 				.image {
 					width: 10vw;
@@ -314,6 +314,7 @@
 
 				.list_1 {
 					flex-grow: 1;
+					width: 85vw;
 					margin: 0 0 0 2vw;
 					font-size: var(--font14Size);
 
@@ -359,7 +360,8 @@
 							word-wrap: break-word;
 							word-break: break-all;
 						}
-						.reply_2{
+
+						.reply_2 {
 							display: flex;
 							flex-direction: column;
 							word-wrap: break-word;

pagesHome/shop/index.vue

@@ -10,7 +10,8 @@
 						<view class="one_1_2">
 							<view class="pubu">
 								<view class="list" v-for="(item,index) in shoplist" :key="index">
-									<image class="image" :src="item.file&&item.file.length>0?item.file[0].url:''" mode=""></image>
+									<image class="image" :src="item.file&&item.file.length>0?item.file[0].url:''"
+										mode=""></image>
 									<view class="name">
 										{{item.name}}
 									</view>
@@ -36,17 +37,20 @@
 						<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage" @scroll="toScroll">
 							<view class="list-scroll-view">
 								<view class="second_1">
-									<view :class="['list',condActive==index?'activeList':'']" v-for="(item,index) in condList" :key="index" @tap="toCond(index,item)">
+									<view :class="['list',condActive==index?'activeList':'']"
+										v-for="(item,index) in condList" :key="index" @tap="toCond(index,item)">
 										<view class="name">
 											{{item.name}}
 										</view>
 										<view class="icon">
 											<view class="icon_1">
-												<text :class="['iconfont',item.shangActive]" v-if="condActive==index&&shang=='1'"></text>
+												<text :class="['iconfont',item.shangActive]"
+													v-if="condActive==index&&shang=='1'"></text>
 												<text :class="['iconfont',item.shang]" v-else></text>
 											</view>
 											<view class="icon_1">
-												<text :class="['iconfont', item.xiaActive]" v-if="condActive==index&&xia=='-1'"></text>
+												<text :class="['iconfont', item.xiaActive]"
+													v-if="condActive==index&&xia=='-1'"></text>
 												<text :class="['iconfont', item.xia]" v-else></text>
 											</view>
 										</view>
@@ -103,7 +107,8 @@
 						</view>
 						<view class="qrcode_1">
 							<view class="qrcode_1_1">
-								<uqrcode ref="uqrcode" canvas-id="qrcode" :value="uqrcodeInfo" :options="{ margin:10 }"></uqrcode>
+								<uqrcode ref="uqrcode" canvas-id="qrcode" :value="uqrcodeInfo" :options="{ margin:10 }">
+								</uqrcode>
 								<view class="txt">
 									店铺二维码
 								</view>
@@ -926,8 +931,14 @@
 							background: red;
 
 							.uqrcode {
+								display: flex;
+								justify-content: center;
 								width: 216px !important;
 								height: 216px !important;
+
+								.uqrcode-canvas {
+									-webkit-transform-origin: center;
+								}
 							}
 
 							// canvas {
@@ -937,6 +948,7 @@
 
 							.txt {
 								margin: 2vw 0 0 0;
+								color: var(--mainColor);
 							}
 						}
 					}