订单详情二维码布局优化

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_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');
+  src: url('//at.alicdn.com/t/font_2631569_eny3iiapmkl.woff2?t=1625043087841') format('woff2'),
+       url('//at.alicdn.com/t/font_2631569_eny3iiapmkl.woff?t=1625043087841') format('woff'),
+       url('//at.alicdn.com/t/font_2631569_eny3iiapmkl.ttf?t=1625043087841') format('truetype');
 }
 
 .lf-iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.lf-icon-shuaxin1:before {
+  content: "\e6d2";
+}
+
 .lf-icon-jianhao:before {
   content: "\e62b";
 }

pages/order/order-details.vue

@@ -16,7 +16,8 @@
 								<lf-price :price="orderDetails.selling_price" style="margin-top: 8rpx;" /> 
 								<view>
 									<button v-if="orderDetails.state == 2" class="cu-btn line-orange text-orange round margin-left-sm lf-font-28" @tap="$routerGo('/pages/order/apply-refund?order_id='+orderDetails.id)">申请退款</button>
-									<button v-else class="cu-btn line-gray bg-white border round margin-left-sm lf-font-28">{{orderDetails.state_text.text}}</button>
+									<button v-if="orderDetails.state == 1" class="cu-btn line-orange text-orange round margin-left-sm lf-font-28" @tap.stop="$routerGo('/pages/order/confirm-atonce?type=1&goods_id='+orderDetails.goods_id+'&goods_specs_id='+orderDetails.goods_specs_id +'&order_id='+ orderDetails.id+'&order_number='+orderDetails.number)">立即付款</button>
+									<button v-if="orderDetails.state != 1 && orderDetails.state != 2" class="cu-btn line-gray bg-white border round margin-left-sm lf-font-28">{{orderDetails.state_text.text}}</button>
 								</view>
 							</view>
 						</view>
@@ -64,19 +65,16 @@
 							<tki-qrcode ref="qrcode" @result="qrR" :val="checkArea" :size="115" unit="px" background="#fff" foreground="#000"
 							 pdground="#000" :onval="true" :loadMake="true" />
 						</view>
-						<view class="flex justify-around align-center text-center" style="margin-top: 10rpx;">
-							<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 style="margin-top: 10rpx;position: relative;top: 26rpx;">
+							<view class="lf-font-32 text-black1">{{checkArea}} <text style="position: relative;left: 216rpx;top: -42rpx;display: inherit;" v-if="orderDetails.state == 2" class="text-orange lf-font-28" @tap="copy(checkArea)">复制</text></view>
 						</view>
 						<view style="margin-top: 10rpx;" class="text-gray lf-font-28" v-if="orderDetails.refund_text">
 							{{orderDetails.refund_text}}
 						</view>
-						<view class="flex align-center text-center" style="margin-top: 10rpx;">
+						<view 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>
+								<text class="lf-iconfont lf-icon-shuaxin1 lf-font-40" style="color: #999;position: relative;left: 84rpx;top: -42rpx;display: inherit;" @tap="refreshCode()" v-if="orderDetails.state==2"></text>
 							</view>
 						</view>
 					</view>