UI验收问题修改 — review by 黄敬囿

@@ -26,7 +26,7 @@
   /* font-size: 24rpx; */
   color: #999999; 
   background-color: #FFFFFF;
-  border: 1px solid #CCCCCC;
+  border: 2rpx solid #CCCCCC;
   border-radius: 0; 
   margin-left: 20rpx;
   /* padding-top: 20rpx;

@@ -4,10 +4,10 @@
   flex-direction: row;
   justify-content: space-between;
   align-items: center;
-  padding-top: 20rpx;
-  padding-bottom: 20rpx;
+  /* padding-top: 20rpx;
+  padding-bottom: 20rpx; */
   background: #FFFFFF;
-  padding-left: 40rpx;
+  /* padding-left: 40rpx; */
   padding-right: 40rpx; 
 }
 .order-action-bottom-info-view {
@@ -51,7 +51,7 @@
   padding-bottom: 10rpx;
   /* padding-left: 40rpx;
   padding-right: 40rpx; */
-  margin-left: 40rpx;
+  margin-left: 20rpx;
   
 }
 .order-action-unselected-button::after {
@@ -67,7 +67,7 @@
   font-size: 24rpx;
   color: #999999; 
   background-color: #FFFFFF;
-  border: 1px solid #CCCCCC;
+  border: 2rpx solid #CCCCCC;
   border-radius: 0; 
   padding-top: 10rpx;
   padding-bottom: 10rpx;

@@ -9,6 +9,6 @@
       </view>
       <text class='component-order-product-name-txt'>{{productInfo.productName}}</text>
       </view>
-      <text class='component-order-size-color-txt'>{{productInfo.colorName}},{{productInfo.sizeName}}</text>
+      <text class='component-order-size-color-txt'>{{productInfo.colorName}}，{{productInfo.sizeName}}</text>
     </view>
   </view>

 /* src/components/order/orderproductinfo.wxss */
 .component-order-product-image {
+  margin-left: 40rpx;
   width: 180rpx;
   height: 180rpx;
 }
@@ -8,15 +9,14 @@
   display: flex;
   flex-direction: row;
   padding-top: 40rpx;
-  padding-left: 40rpx;
   padding-right: 40rpx;
 }
 .component-order-right-view {
   /* width: 490rpx; */
   display: flex;
   flex-direction: column;
-  justify-content: space-between;
-  flex:1;
+  /* justify-content: space-between; */
+  /* flex:1; */
   margin-left: 20rpx;
   /* position: fixed; */
 }
@@ -37,6 +37,7 @@
 }
 .component-order-status-txt {
   font-family: PingFang-SC-Medium;
+  font-weight: 500;
   font-size: 24rpx;
   color: #000000;
 }
@@ -54,7 +55,9 @@
 }
 .component-order-size-color-txt {
   font-family: PingFang-SC-Medium;
+  font-weight: 500;
   font-size: 24rpx;
   color: #000000;
   margin-top: 28rpx;
+  margin-bottom: 40rpx;
 }
\ No newline at end of file

 <view wx:if="{{hasAddress}}">
   <view class="addressHasItem">
     <view class="addressHasIconContainer">
-      <image class="addressHasIcon" src="{{addressIcon}}"></image>
+      <image class="addressHasIcon" src="{{addressIcon}}" mode='aspectFill'></image>
     </view>
     <view class="addressRightContainer">
       <text class="addressUserName">{{address.consignee}}</text>

@@ -6,8 +6,9 @@
 .addressNoText {
   font-size:40rpx;
   font-family: PingFang-SC-Medium;
+  font-weight: 500;
   color: #000000;
-
+  margin-left: 10rpx;
 }
 
 .addressNoItem {
@@ -26,8 +27,8 @@
 }
 
 .addressHasIcon {
-  width: 40rpx;
-  height: 40rpx;
+  width: 48rpx;
+  height: 48rpx;
 }
 
 .addressUserName {

@@ -2,7 +2,7 @@
   display: flex;
   flex-direction: row;
   padding-top: 35rpx;
-  /* padding-bottom: 10rpx; */
+  padding-bottom: 10rpx;
   border-bottom: 1px solid #EEEEEE;
   border-top: 1px solid #EEEEEE;
 }

@@ -44,14 +44,14 @@
   </view>
   <view class='order-detail-count-view'>
     <text class='order-detail-sum-black-txt'>实际金额：</text>
-    <text class='order-detail-sum-black-txt'>¥{{priceInfo.realPayPrice}}</text>
+    <text class='order-detail-sum-red-txt'>¥{{priceInfo.realPayPrice}}</text>
   </view>
   <view class='order-detail-split-line'></view>
   <view class='order-detail-create-time-view'>
     <text class='order-detail-create-time-txt'>创建时间：</text>
     <text class='order-detail-create-time-txt'>{{submitOrderTimeStr}}</text>
   </view>
-  <view>
+  <view class='order-detail-order-code-view'>
     <text class='order-detail-create-time-txt'>订单编号：</text>
     <text class='order-detail-create-time-txt'>{{orderCode}}</text>
   </view>

@@ -44,9 +44,7 @@
   border-radius: 0;
   padding-top: 10rpx;
   padding-bottom: 10rpx;
-  /* padding-left: 40rpx;
-  padding-right: 40rpx; */
-  margin-left: 40rpx;
+  margin-left: 20rpx;
   
 }
 .order-detail-bottom-unselected-button::after {
@@ -59,7 +57,7 @@
   font-size: 24rpx;
   color: #999999; 
   background-color: #FFFFFF;
-  border: 1px solid #CCCCCC;
+  border: 2rpx solid #CCCCCC;
   border-radius: 0; 
   padding-top: 10rpx;
   padding-bottom: 10rpx;
@@ -72,7 +70,7 @@
   flex-direction: column;
 }
 .order-detail-split-line {
-  background: #e0e0e0;
+  background: #eeeeee;
   height: 2rpx;
   margin-top: 40rpx;
 }
@@ -170,6 +168,7 @@
 }
 .order-detail-status-title-txt {
   font-family: SFProDisplay-Bold;
+  font-weight: bold;
   font-size: 68rpx;
   color: #000000;
 }
@@ -189,10 +188,15 @@
   font-size: 28rpx;
   color: #999999;
 }
+.order-detail-sum-red-txt {
+  font-family: PingFang-SC-Regular;
+  font-size: 28rpx;
+  color: #D0021B;
+}
 .order-detail-sum-black-txt {
   font-family: PingFang-SC-Regular;
   font-size: 28rpx;
-  color: #999999;
+  color: #000000;
 }
 .order-detail-create-time-view {
   margin-top: 40rpx;
@@ -207,6 +211,9 @@ color: #000000 ;
   font-size: 28rpx;
   color: #D0021B;
 }
+.order-detail-order-code-view{
+  margin-top: 10rpx;
+}
 .order-detail-pay-amount-title-txt {
   font-family: PingFang-SC-Regular;
   font-size: 24rpx;
@@ -247,9 +254,16 @@ color: #000000 ;
 }
 .order-action-pay-amount-txt {
   font-family: DINAlternate-Bold;
+  font-weight: 500;
   font-size: 28rpx;
   color: #D0021B;
 }
+.order-daction-pay-amount-title-txt {
+  font-family: PingFang-SC-Regular;
+  font-size: 24rpx;
+  color: #000000;
+  letter-spacing: 0;
+}
 
 #orderdetailaction {
   position: fixed;

-/* view , page {
-  padding: 0px;
-  margin: 0px;
-} */
 
 .order-list-page {
   height: 100%;
   display: flex;
   flex-direction: column;
-  /* justify-content: flex-start; */
 }
-/* .order-list-split-line {
-  height: 2rpx;
-  background-color: #E0E0E0;
-} */
 
 .order-list-navbar {
     display: flex;
+    align-items: center;
+    justify-content: space-evenly;
     position: absolute;
     z-index: 500;
     top: 0;
     width: 100%;
-    border-bottom: 1rpx solid #CCCCCC;
+    height: 96rpx;
+    border-top: 2rpx solid #eeeeee;
+    border-bottom: 2rpx solid #eeeeee;
 }
 .order-list-navbar-item {
     position: relative;
-    display: block;
-    flex: 1;
     padding: 20rpx 0;
     text-align: center;
+    font-family: PingFang-SC-Medium;
+    font-weight: 500;
     font-size: 28rpx;
     color: #999999;
-    height: 68rpx;
-    line-height: 68rpx;
 }
 .order-list-navbar-item-on {
     color: #000000;
     font-weight: bold;
-    font-size: 36rpx;
+    font-size: 40rpx;
+    font-family: PingFang-SC-Medium;
+    border-bottom: 6rpx solid #000000;
 }
 .order-list-navbar-slider {
     position: absolute;
     display: block;
     content: " ";
-    left: 0;
-    bottom: 0;
-    height: 5rpx;
-    background-color: #000000;
     transition: transform .3s;
 }
 

@@ -8,8 +8,8 @@
 }
 .orderlistcell-root-split-line {
   height: 2rpx;
-  background: #e0e0e0;
-  
+  background: #eeeeee;
+  margin-top: 40rpx;
 }
 /* .orderlistcell-image {
   width: 160rpx;

@@ -79,7 +79,10 @@ export default class ProductDetail extends Component {
         let id = this.$router.params.id;
 
         var scene = decodeURIComponent(this.$router.params.scene)
-
+        console.log('====================================');
+        console.log(this.$router.params);
+        console.log(scene);
+        console.log('====================================');
         this.setState({
             id: id
         });

@@ -17,7 +17,6 @@ Page({
   data: {
     items: [],
     order_code: "",
-    showContainer: false,
     hiddenOpt: false,
     currentMode: modeSelect,
     modeEdit: modeEdit,
@@ -312,7 +311,6 @@ Page({
         }
         this.setData({
           items: this.data.items,
-          showContainer: this.data.items.length > 0,
           currentSelectedIndex
         })
       }

 <scroll-view scroll-y='true' class="my-address-page">
-      <block wx:if="{{showContainer}}">
-        <view wx:if="{{showContainer}}" class="address-container">
-          <radio-group class="radio-group" bindchange="">
-              <label class="radio" wx:for="{{items}}" wx:key="{{address_id}}" wx:for-index="index">
-                  <view class="address-item" bindtap="selectAddress" data-index='{{index}}'>
-                      <image wx:if="{{currentMode != modeEdit && currentSelectedIndex == index}}" src='../../../assets/images/current-select@3x.png' class='current-select-image'></image>
-                      <view class='name-container'>
-                        <view class="name">{{item.consignee}}</view>
-                        <view class="tel">{{item.mobile}}</view>
-                        <view class="default" wx:if="{{item.is_default=='Y'}}">默认</view>
-                        <view catchtap="editButtonTapped" class="edit" data-id="{{item.address_id}}" data-consignee="{{item.consignee}}" data-mobile="{{item.mobile}}" data-area_code="{{item.area_code}}" data-address="{{item.area}}" data-detail_address="{{item.address}}" data-is_default="{{item.is_default}}">编辑</view>
-                      </view>
-                      <view class="address-info">{{item.area + ' ' + item.address}}</view>
-                      <view class='separator'></view>
-                  </view>
-              </label>
-          </radio-group>
-        </view>
-      </block>
-      <block wx:else>
-        <view class='emptyClass' style='width:100%;height:100%;margin-top:200rpx'>
-          <image src="../../../assets/images/noad@3x.png" style="width:143rpx;height:190rpx;margin-top:80rpx"></image>
-          <view style="font-size:30rpx;text-align:center;margin-top:30rpx;color:#444444;">尚无地址，点击底部新增</view>
-        </view>
-      </block>
-    </scroll-view>
-    <view catchtap="addButtonTapped" class='add-addressButton'>添加地址</view>
+  <view class="address-container">
+    <radio-group class="radio-group" bindchange="">
+        <label class="radio" wx:for="{{items}}" wx:key="{{address_id}}" wx:for-index="index">
+            <view class="address-item" bindtap="selectAddress" data-index='{{index}}'>
+                <view class='name-container'>
+                  <view class="name">{{item.consignee}}</view>
+                  <view class="tel">{{item.mobile}}</view>
+                  <view class="default" wx:if="{{item.is_default=='Y'}}">默认</view>
+                  <view catchtap="editButtonTapped" class="edit" data-id="{{item.address_id}}" data-consignee="{{item.consignee}}" data-mobile="{{item.mobile}}" data-area_code="{{item.area_code}}" data-address="{{item.area}}" data-detail_address="{{item.address}}" data-is_default="{{item.is_default}}">编辑</view>
+                </view>
+                <view class="address-info">{{item.area + ' ' + item.address}}</view>
+                <view class='separator'></view>
+            </view>
+        </label>
+    </radio-group>
+  </view>
+</scroll-view>
+
+<view catchtap="addButtonTapped" class='add-addressButton'>添加地址</view>
 <!-- <import src="../../vendors/toast/wetoast.wxml"/>
 <template is="wetoast" data="{{...__wetoast__}}"/> -->

@@ -51,14 +51,6 @@
     position: relative;
 }
 
-.address-item .current-select-image {
-    width:60rpx;
-    height:60rpx;
-    position: absolute;
-    right: 0rpx;
-    top: 0rpx;
-}
-
 .my-address-page .address-item .name-container {
   display: flex;
   align-items: center;