Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/uniapp-shikongwang

common/styles/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "lf-iconfont"; /* Project id 2631569 */
-  src: url('//at.alicdn.com/t/font_2631569_oxrildtg1f.woff2?t=1624852913594') format('woff2'),
-       url('//at.alicdn.com/t/font_2631569_oxrildtg1f.woff?t=1624852913594') format('woff'),
-       url('//at.alicdn.com/t/font_2631569_oxrildtg1f.ttf?t=1624852913594') format('truetype');
+  src: url('//at.alicdn.com/t/font_2631569_ohrhscqiujo.woff2?t=1625021733659') format('woff2'),
+       url('//at.alicdn.com/t/font_2631569_ohrhscqiujo.woff?t=1625021733659') format('woff'),
+       url('//at.alicdn.com/t/font_2631569_ohrhscqiujo.ttf?t=1625021733659') format('truetype');
 }
 
 .lf-iconfont {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.lf-icon-jianhao:before {
+  content: "\e62b";
+}
+
+.lf-icon-jiahao:before {
+  content: "\e624";
+}
+
 .lf-icon-weixin:before {
   content: "\f262";
 }

pages/order/confirm-order.vue

@@ -14,9 +14,9 @@
 							<view class="flex justify-between align-center text-center">
 								<text class="block margin-top-sm text-gray lf-font-28" style="margin-top: 20rpx;line-height: 40rpx;">数量</text>
 								<view class="flex align-center margin-top-sm">
-									<text class="lf-iconfont lf-icon-jianshao lf-font-40" @tap="reduce"></text>
-									<input type="number" v-model="num" class="text-center margin-lr-sm radius text-black lf-font-32" style="width: 60rpx; height: 50rpx;" />
-									<text class="lf-iconfont lf-icon-jia1 lf-font-40" @tap="add"></text>
+									<text class="lf-iconfont lf-icon-jianhao lf-font-40" style="color: #999;" @tap="reduce"></text>
+									<input type="number" v-model="num" class="text-center margin-lr-sm radius text-black lf-font-32" style="width: 60rpx; height: 50rpx;background-color: #f1f1f1;color: #222;" />
+									<text class="lf-iconfont lf-icon-jiahao lf-font-40" style="color: #999;" @tap="add"></text>
 								</view>
 							</view>
 							

pages/order/order-details.vue

@@ -65,17 +65,19 @@
 							 pdground="#000" :onval="true" :loadMake="true" />
 						</view>
 						<view class="flex justify-around align-center text-center" style="margin-top: 10rpx;">
-							<view @tap="refreshCode()" v-if="orderDetails.state==2">
-								<image class="margin-right" src="@/static/images/system/refresh.png" mode="widthFix" style="width: 20px;height: 20px;"></image>
-							</view>
 							<view class="lf-font-32 text-black1">{{checkArea}}</view>
 							<view v-if="orderDetails.state == 2" class="text-orange lf-font-28 margin-left" @tap="copy(checkArea)">复制</view>
 						</view>
 						<view style="margin-top: 10rpx;" class="text-gray lf-font-28" v-if="orderDetails.refund_text">
 							{{orderDetails.refund_text}}
 						</view>
-						<view style="margin-top: 10rpx;" class="text-green lf-font-32" v-if="orderDetails.state == 2">
-							{{orderDetails.confirm_code_text}}
+						<view class="flex align-center text-center" style="margin-top: 10rpx;">
+							<view class="text-green lf-font-32" v-if="orderDetails.state == 2">
+								{{orderDetails.confirm_code_text}}
+							</view>
+							<view @tap="refreshCode()" v-if="orderDetails.state==2">
+								<image class="margin-left" src="@/static/images/system/refresh.png" mode="widthFix" style="width: 20px;height: 20px;"></image>
+							</view>
 						</view>
 					</view>
 					<view class="padding-lr padding-tb-sm bg-white flex justify-between align-center solid-top1 btn-bottom">