add

wechat/app.js

@@ -18,7 +18,6 @@ App({
         api = this.api;
 
         this.getNavigationBarColor();
-        console.log(wx.getSystemInfoSync());
         this.getStoreData();
         this.getCatList();
     },
@@ -67,7 +66,6 @@ App({
                     var code = res.code;
                     wx.getUserInfo({
                         success: function (res) {
-                            //console.log(res);
                             getApp().request({
                                 url: api.passport.login,
                                 method: "post",
@@ -80,12 +78,9 @@ App({
                                 },
                                 success: function (res) {
                                     wx.hideLoading();
-                                    // console.log(code)
                                     if (res.code == 0) {
                                         wx.setStorageSync("access_token", res.data.access_token);
                                         wx.setStorageSync("user_info", res.data);
-                                        // console.log(res);
-                                        // var parent_id = wx.getStorageSync("parent_id");
                                         var p = getCurrentPages();
                                         var parent_id = 0;
                                         if (p[0].options.user_id != undefined) {
@@ -94,7 +89,6 @@ App({
                                         else if (p[0].options.scene != undefined) {
                                             var parent_id = p[0].options.scene;
                                         }
-                                        // console.log(parent_id, p[0].options.scene, p[0].options.user_id);
                                         getApp().bindParent({
                                             parent_id: parent_id || 0
                                         });
@@ -358,6 +352,16 @@ App({
             var page = this;
             app.navigatorClick(e,page);
         }
+        wx.getSystemInfo({
+            success: res => {
+                let modelmes = res.model;
+                if (modelmes.search('iPhone X') != -1) {
+                    page.setData({
+                        isIphoneX: true
+                    })
+                }
+            }
+        })  
     },
     pageOnReady: function (page) {
         console.log('--------pageOnReady----------');

wechat/app.json

@@ -1,8 +1,9 @@
 {
   "pages": [
     "pages/index/index",
-    "pages/order/order",
     "pages/favorite/favorite",
+    "pages/order/order",
+    "pages/order-refund-detail/order-refund-detail",
     "pages/address/address",
     "pages/address-edit/address-edit",
     "pages/user/user",
@@ -22,7 +23,6 @@
     "pages/search/search",
     "pages/order-submit/order-submit",
     "pages/test/test",
-    "pages/order-refund-detail/order-refund-detail",
     "pages/add-share/index",
     "pages/share/index",
     "pages/cash/cash",

wechat/app.wxss

@@ -55,7 +55,6 @@ button{
     display: -webkit-box;
     display: -webkit-flex;
     display: flex;
-
     -webkit-box-orient: horizontal;
     -webkit-flex-direction: row;
     flex-direction: row;
@@ -65,7 +64,6 @@ button{
     display: -webkit-box;
     display: -webkit-flex;
     display: flex;
-
     -webkit-box-orient: vertical;
     -webkit-flex-direction: column;
     flex-direction: column;
@@ -96,7 +94,6 @@ button{
     display: -webkit-box;
     display: -webkit-flex;
     display: flex;
-
     -webkit-box-pack: center;
     -webkit-justify-content: center;
     -ms-flex-pack: center;
@@ -106,7 +103,6 @@ button{
     display: -webkit-box;
     display: -webkit-flex;
     display: flex;
-
     -webkit-box-align: center;
     -webkit-align-items: center;
     -ms-flex-align: center;
@@ -457,4 +453,8 @@ button[plain]{
     border: 1px solid #EB4851;
     color: #EB4851;
     background: #ffffff;
+}
+.iphoneX{
+    padding-bottom: 34rpx;
+    height: 140rpx
 }

wechat/commons/navbar/navbar.wxml

@@ -1,5 +1,5 @@
 <block wx:if="{{_navbar && _navbar.navs && _navbar.navs.length>0}}">
-    <view class="navbar flex-row" style="background-image: url({{_navbar.background_image}})">
+    <view class="navbar flex-row {{isIphoneX ? 'iphoneX' : ''}}" style="background-image: url({{_navbar.background_image}})">
         <block wx:for="{{_navbar.navs}}">
             <navigator class="flex-grow-1 flex-y-center" url="{{item.url}}" open-type="wxapp" wx:if='{{item.open_type == "wxapp"}}' bindtap='naveClick' data-appid='{{item.appid}}' data-path='{{item.path}}' data-open_type='{{item.open_type}}'>
                 <view>

wechat/pages/order-comment/order-comment.js

@@ -7,7 +7,8 @@ Page({
      * 页面的初始数据
      */
     data: {
-        goods_list: []
+        goods_list: [],
+        // score: 5
     },
 
     /**
@@ -44,7 +45,7 @@ Page({
                 }
                 if (res.code == 0) {
                     for (var i in res.data.goods_list) {
-                        res.data.goods_list[i].score = 3;
+                        res.data.goods_list[i].score = 5;
                         res.data.goods_list[i].content = "";
                         res.data.goods_list[i].pic_list = [];
                         res.data.goods_list[i].uploaded_pic_list = [];

wechat/pages/order-comment/order-comment.wxml

@@ -1,20 +1,20 @@
 <view class="goods-list">
-    <view class="goods-item">
+    <view class="goods-item" wx:for="{{goods_list}}">
 
         <view class="flex-row score-row">
             <view class="flex-grow-0 ">
                 <image class="goods-pic" src="{{item.goods_pic}}"></image>
             </view>
             <view class="flex-grow-1 flex-row">
-                <text class="flex-y-center">好评</text>
+                 <text class="flex-y-center" style='margin-left: 40rpx;'>描述相符</text> 
                 <view class="flex-grow-1 score-item flex-y-center flex-x-center {{item.score==3?'active':''}}">
                     <image bindtap="setScore" data-index="{{index}}" data-score="1" src="/images/star-all.png"></image>
-                    <image bindtap="setScore" data-index="{{index}}" data-score="2" src="/images/star-all.png"></image>
-                    <image bindtap="setScore" data-index="{{index}}" data-score="3" src="/images/star-all.png"></image>
-                    <image bindtap="setScore" data-index="{{index}}" data-score="4" src="/images/star-all.png"></image>
-                    <image bindtap="setScore" data-index="{{index}}" data-score="5" src="/images/star-all.png"></image>
+                    <image bindtap="setScore" data-index="{{index}}" data-score="2" src="/images/star-{{item.score>1?'all':'zero'}}.png"></image>
+                    <image bindtap="setScore" data-index="{{index}}" data-score="3" src="/images/star-{{item.score>2?'all':'zero'}}.png"></image>
+                    <image bindtap="setScore" data-index="{{index}}" data-score="4" src="/images/star-{{item.score>3?'all':'zero'}}.png"></image>
+                    <image bindtap="setScore" data-index="{{index}}" data-score="5" src="/images/star-{{item.score>4?'all':'zero'}}.png"></image>
                 </view>
-                <text style='color: #9D9D9D;' class="flex-y-center">满意</text>
+                <text style='color: #9D9D9D;' class="flex-y-center">{{ item.score==3 ? '一般' :  item.score>3 ? '满意' : '差劲' }}</text>
             </view> 
             <!-- <view class="flex-grow-1 flex-row">
                 <view bindtap="setScore" data-index="{{index}}" data-score="3"
@@ -36,7 +36,6 @@
         </view>
 
         <view class="flex-row content-row">
-            <!-- <view class="flex-grow-0 nowrap form-label">评价内容</view> -->
             <view class="flex-grow-1">
                 <textarea bindinput="contentInput"
                           data-index="{{index}}"
@@ -47,6 +46,11 @@
         </view>
 
         <view class="pic-list">
+            <view wx:if="{{!item.pic_list||item.pic_list.length<6}}"
+                  class="image-picker"
+                  bindtap="chooseImage" data-index="{{index}}">
+                <image style="width: 160rpx;height: 160rpx" src="/images/icon-image-add.png"></image>
+            </view>
             <view class="image-preview" wx:for="{{item.pic_list}}" wx:for-index="pic_index">
                 <text class="flex-x-center flex-y-center image-del"
                       bindtap="deleteImage"
@@ -55,11 +59,6 @@
                 </text>
                 <image src="{{item}}" style="width: 160rpx;height: 160rpx" mode="aspectFill"></image>
             </view>
-            <view wx:if="{{!item.pic_list||item.pic_list.length<6}}"
-                  class="image-picker"
-                  bindtap="chooseImage" data-index="{{index}}">
-                <image style="width: 160rpx;height: 160rpx" src="/images/icon-image-add.png"></image>
-            </view>
         </view>
     </view>
 </view>

wechat/pages/order-comment/order-comment.wxss

@@ -79,9 +79,9 @@
     position: absolute;
     top:-15rpx;
     right: -15rpx;
-    height: 50rpx;
-    width: 50rpx;
-    background: #ff4544;
+    height: 40rpx;
+    width: 40rpx;
+    background: #E9554E;
     color: #fff;
     font-weight: bolder;
     border-radius: 999rpx;

wechat/pages/order-detail/order-detail.wxml

@@ -124,7 +124,7 @@
         <view wx:if="{{item.order_refund_enable==1}}">
           <navigator wx:if="{{item.is_order_refund==0}}" class="flex-y-center refund-btn" url="/pages/order-refund/order-refund?id={{item.order_detail_id}}">申请售后
           </navigator>
-          <navigator wx:else="{{item.is_order_refund==1}}" class="flex-y-center refund-btn" url="/pages/order-refund-detail/order-refund-detail?id={{item.order_detail_id}}">退款中
+          <navigator wx:else="{{item.is_order_refund==1}}" class="flex-y-center refund-btn" url="/pages/order-refund-detail/order-refund-detail?id={{item.order_refund_id}}">退款中
           </navigator>
         </view>
       </view>

wechat/pages/order-refund-detail/order-refund-detail.wxml

@@ -1,26 +1,76 @@
 <!--pages/order-refund-detail/order-refund-detail.wxml-->
-<!-- <view class="bg-white mb-20 goods-item">
-    <view class="data-list">
-        <view class="data-item flex-row">
-            <view class="flex-grow-0 item-icon flex-col">
-                <view class="item-line flex-grow-0"></view>
-                <view class="item-line flex-grow-0 fs-0">
-                    <image class="point-gray" src="/images/icon-point-gray.png" style="width:16rpx;height: 16rpx "></image>
-                    <image class="point-green" src="/images/icon-point-green.png" style="width:32rpx;height: 32rpx;left: -15rpx "></image>
-                </view>
-            </view>
+<view wx:if='{{order_refund.refund_type==1}}' class='goods-item' style='margin-bottom: 20rpx;'>
+    <view class='flex progress'>
+        <view class='flex-y-center flex-x-center'>
+            <image wx:if='{{order_refund.refund_status==0}}' style='width: 50rpx; height: 50rpx;' src='/images/refund_active.png'></image>
+            <image wx:else style='width: 30rpx; height: 30rpx;' src='/images/refund_active.png'></image>
         </view>
-        <view class="data-item flex-row">
-            <view class="flex-grow-0 item-icon flex-col">
-                <view class="item-line flex-grow-0"></view>
-                <view class="item-line flex-grow-0 fs-0">
-                    <image class="point-gray" src="/images/icon-point-gray.png" style="width:16rpx;height: 16rpx "></image>
-                    <image class="point-green" src="/images/icon-point-green.png" style="width:32rpx;height: 32rpx;left: -15rpx "></image>
-                </view>
-            </view>
+        <view class='flex-y-center flex-x-center' style='width: 22%;'>
+            <view wx:if='{{order_refund.refund_status>0}}' style='width: 100%; height: 1px; background-color: #EB4851;'></view>
+            <view wx:else style='width: 100%; height: 1px; background-color: #CACBCC;'></view>
+        </view>
+        <view class='flex-y-center flex-x-center'>  
+            <image wx:if='{{order_refund.refund_status==1 || order_refund.refund_status==3}}' style='width: 50rpx; height: 50rpx;' src='/images/refund_active.png'></image>
+            <image wx:elif='{{order_refund.refund_status>1}}' style='width: 30rpx; height: 30rpx;' src='/images/refund_active.png'></image>      
+            <image wx:else style='width: 30rpx; height: 30rpx;' src='/images/refund_default.png'></image>
+        </view>
+        <view class='flex-y-center flex-x-center' style='width: 22%;'>
+            <view wx:if='{{order_refund.refund_status>1}}' style='width: 100%; height: 1px; background-color: #EB4851;'></view>
+            <view wx:else style='width: 100%; height: 1px; background-color: #CACBCC;'></view>
+        </view>
+        <view class='flex-y-center flex-x-center'>
+            <image wx:if='{{order_refund.refund_status==4}}' style='width: 50rpx; height: 50rpx;' src='/images/refund_active.png'></image>
+            <image wx:elif='{{order_refund.refund_status>4}}' style='width: 30rpx; height: 30rpx;' src='/images/refund_active.png'></image>      
+            <image wx:else style='width: 30rpx; height: 30rpx;' src='/images/refund_default.png'></image>      
+        </view>
+        <view class='flex-y-center' style='width: 21%;'>
+            <view wx:if='{{order_refund.refund_status>4}}' style='width: 100%; height: 1px; background-color: #EB4851;'></view>
+            <view wx:else style='width: 100%; height: 1px; background-color: #CACBCC;'></view>
+        </view>
+        <view class='flex-y-center flex-x-center'>
+            <image wx:if='{{order_refund.refund_status==5}}' style='width: 50rpx; height: 50rpx;' src='/images/refund_active.png'></image>
+            <image wx:else style='width: 30rpx; height: 30rpx;' src='/images/refund_default.png'></image>         
         </view>
     </view>
-</view> -->
+    <view class='flex-row' style='text-align: center;'>
+        <view class='flex-grow-1'>提交申请</view>
+        <view wx:if='{{order_refund.refund_status==3}}' class='flex-grow-1'>审核不通过</view>
+        <view wx:else class='flex-grow-1'>审核通过</view>
+        <view class='flex-grow-1'>寄回商品</view>
+        <view class='flex-grow-1'>完成退货</view>
+    </view> 
+</view>
+<view wx:else class='goods-item' style='margin-bottom: 20rpx;'>
+    <view class='flex' style='margin: 0 0 5% 14%;'>
+        <view class='flex-y-center flex-x-center'>
+            <image wx:if='{{order_refund.refund_status==0}}' style='width: 50rpx; height: 50rpx;' src='/images/refund_active.png'></image>
+            <image wx:else style='width: 30rpx; height: 30rpx;' src='/images/refund_active.png'></image>
+        </view>
+        <view class='flex-y-center flex-x-center' style='width: 32%;'>
+            <view wx:if='{{order_refund.refund_status>0}}' style='width: 100%; height: 1px; background-color: #EB4851;'></view>
+            <view wx:else style='width: 100%; height: 1px; background-color: #CACBCC;'></view>
+        </view>
+        <view class='flex-y-center flex-x-center'>
+            <image wx:if='{{order_refund.refund_status==2 || order_refund.refund_status==3}}' style='width: 50rpx; height: 50rpx;' src='/images/refund_active.png'></image>
+            <image wx:elif='{{order_refund.refund_status>3}}' style='width: 30rpx; height: 30rpx;' src='/images/refund_active.png'></image>      
+            <image wx:else style='width: 30rpx; height: 30rpx;' src='/images/refund_default.png'></image>
+        </view>
+        <view class='flex-y-center flex-x-center' style='width: 32%;'>
+            <view wx:if='{{order_refund.refund_status>3}}' style='width: 100%; height: 1px; background-color: #EB4851;'></view>
+            <view wx:else style='width: 100%; height: 1px; background-color: #CACBCC;'></view>
+        </view>
+        <view class='flex-y-center flex-x-center'>
+            <image wx:if='{{order_refund.refund_status==6}}' style='width: 50rpx; height: 50rpx;' src='/images/refund_active.png'></image>
+            <image wx:else style='width: 30rpx; height: 30rpx;' src='/images/refund_default.png'></image>       
+        </view>
+    </view>
+    <view class='flex-row' style='text-align: center;'>
+        <view class='flex-grow-1'>提交申请</view>
+        <view wx:if='{{order_refund.refund_status==3}}' class='flex-grow-1'>审核不通过</view>
+        <view wx:else class='flex-grow-1'>审核通过</view>
+        <view class='flex-grow-1'>完成退款</view>
+    </view> 
+</view>
 <view class="goods-item">
     <view class="flex-row">
         <view class="flex-col">
@@ -48,9 +98,10 @@
     <view>退款原因：{{order_refund.refund_desc}}</view>
 </view>
 <view wx:if="{{order_refund.express_name=='' && order_refund.refund_type==1}}" style='text-align: center;'>
-    <navigator url='/pages/express-orderid/express-orderid?order_id={{order_id}}' class='button'>填写运单号</navigator>
+    <view wx:if='{{order_refund.refund_status==0}}' class='button'>填写运单号</view>
+    <navigator wx:elif='{{order_refund.refund_status < 3}}' url='/pages/express-orderid/express-orderid?order_id={{order_id}}' class='button' style='background: #EB4851;'>填写运单号</navigator>
 </view>
-<view class='wrapper' wx:if="{{order_refund.express_name!==''}}">
+<view class='wrapper bg-white' wx:if="{{order_refund.express_name!==''}}">
     <view class='reason-item'>
         <view class="flex-grow-1 flex-row">
             <view class="flex-y-center" style='width: 100%;'>

wechat/pages/order-refund-detail/order-refund-detail.wxss

@@ -1,6 +1,5 @@
 /* pages/order-refund-detail/order-refund-detail.wxss */
 @import '../favorite/favorite.wxss';
-@import '../express-orderid/express-orderid.wxss';
 page{
     background: #EFEFF4;
 }
@@ -8,6 +7,11 @@ page{
     padding: 30rpx 40rpx;
     background: #fff;
 }
+.reason-item{
+    padding: 25rpx 0;
+    margin: 0 20rpx;
+    border-bottom: 1px solid #ECECEC;
+}
 .data-row{
     padding: 20rpx 40rpx;
 }
@@ -78,4 +82,8 @@ page{
 
 .data-list .data-item:last-child .item-content{
     border-bottom: none;
+}
+
+.progress{
+    margin: 0 0 5% 10%;
 }

wechat/pages/order-refund/order-refund.js

@@ -173,7 +173,7 @@ Page({
         /*--退货退款开始--*/
         if (type == 1) {//退货退款
             var desc = page.data.reason;
-            if (desc.length == 0) {
+            if (desc == undefined) {
                 wx.showToast({
                     title: "请填写退款原因",
                     image: "/images/icon-warning.png"

wechat/pages/order-refund/order-refund.wxml

@@ -39,7 +39,7 @@
                 <navigator url='/pages/order-refund-reason/order-refund-reason?order_detail_id={{order_detail_id}}' class="flex-grow-1 flex-row">
                     退款原因
                     <view class="flex-grow-1 flex-x-center flex-y-center">
-                        退款原因
+                        {{reason}}
                         <image style='width:12rpx; margin-left: 20rpx;' mode='widthFix' src='/images/icon-jiantou-r.png'></image>
                     </view>
                 </navigator> 
@@ -78,9 +78,9 @@
             </view>
         </view>
         <view class="bg-white form-row mb-20">
-            <view class="mb-20">
+            <!-- <view class="mb-20">
                 <text class="form-label">上传凭证</text>
-            </view>
+            </view> -->
             <view class="image-list">
                 <view class="image-preview" wx:for="{{refund_data_2.pic_list}}" data-index="{{index}}">
                     <text class="flex-x-center flex-y-center image-del" bindtap="deleteImage" data-type="2"
@@ -90,7 +90,7 @@
                 </view>
                 <view wx:if="{{!refund_data_2.pic_list||refund_data_2.pic_list.length<6}}" class="image-picker"
                       bindtap="chooseImage" data-type="2">
-                    <image style="width: 160rpx;height: 160rpx" src="/images/icon-image-picker.png"></image>
+                    <image style="width: 160rpx;height: 160rpx" src="/images/icon-image-add.png"></image>
                 </view>
             </view>
         </view>

wechat/pages/order/order.js

@@ -340,6 +340,30 @@ Page({
         this.setData({
             hide: 1
         });
+    },
+    refundDel: function(e){
+        var page = this;
+        app.request({
+            url: api.order.refund_del,
+            data: {
+                order_id: e.currentTarget.dataset.id,
+            },
+            success: function (res) {
+                if (res.code == 0) {
+                    wx.showToast({
+                        title: res.msg
+                    })
+                    setTimeout(function(){
+                        page.loadOrderList(4);
+                    },2000)
+                }
+                else{
+                    wx.showToast({
+                        title: res.msg
+                    })
+                }
+            }
+        });
     }
 
 });

wechat/pages/order/order.wxml

@@ -1,7 +1,7 @@
 <!--order.wxml-->
 <navigator class="return-index-btn" open-type="redirect" wx:if="{{show_index}}" url="/pages/index/index">
     <image src="/images/nav-icon-index.png" style="width: 50rpx;height: 50rpx"></image>
-</navigator>
+</navigator> 
 <view class="flex-row tab-bar">
     <view class="flex-grow-1">
         <navigator class="{{status==0?'active':''}}" url="/pages/order/order?status=0" open-type="redirect">
@@ -63,26 +63,28 @@
         <view class="flex-row">
             <view class="flex-grow-1 flex-y-center">
                 <block wx:if="{{status==4}}">
-                    <block wx:if="{{order.refund_type==1}}">
-                        退货退款：
-                        <text style="color: #ff4544">￥{{order.refund_price}}</text>
-                    </block>
-                    <block wx:if="{{order.refund_type==2}}">
-                        换货
-                    </block>
+                    <view class='flex-grow-0 flex-y-center'>
+                        <!-- 退货退款：
+                        <text style="color: #ff4544">￥{{order.refund_price}}</text> -->
+                        <image class='refundImg' src='/images/refund.png'></image>
+                        <view class='flex-col' style="color: #EB4851; margin-left: 10rpx;"> 
+                             {{order.refund_status == 5 || order.refund_status == 6 ? '退款完成' : '退款处理中'}} 
+                        </view>         
+                    </view>
                 </block>
                 <block wx:else>合计：￥{{order.pay_price}}</block>
             </view>
             <view class="flex-grow-0 flex-y-center flex-row">
                 <block wx:if="{{status==4}}">
-                    <view wx:if="{{order.refund_status==0}}">等待处理</view>
+                    <view bindtap='refundDel' data-id='{{order.order_refund_id}}' wx:if='{{order.refund_status == 5 || order.refund_status == 6}}' class="order-option-btn">删除订单</view>
+                    <!-- <view wx:if="{{order.refund_status==0}}">等待处理</view>
                     <view style="color: #36ba75" wx:if="{{order.refund_status==1}}">已同意并退款</view>
                     <view style="color: #36ba75" wx:if="{{order.refund_status==2}}">已同意换货</view>
 
                     <block wx:if="{{order.refund_status==3}}">
                         <view style="color: #ff4544" wx:if="{{order.refund_type==1}}">已拒绝退货退款</view>
-                        <view style="color: #ff4544" wx:if="{{order.refund_type==2}}">已拒绝换货</view>
-                    </block>
+                        <view style="color: #ff4544" wx:if="{{order.refund_type==2}}">已拒绝退款</view>
+                    </block> -->
                 </block>
                 <block wx:else>
                     <view class="flex-grow-1" wx:if="{{order.is_send==0}}">

wechat/pages/order/order.wxss

@@ -23,8 +23,8 @@
 }
 
 .tab-bar navigator.active text{
-    color: #f00;
-    border-bottom: 2rpx solid #f00;
+    color: #EB4851;
+    border-bottom: 6rpx solid #EB4851;
 }
 
 .order-list .order-item{
@@ -42,7 +42,6 @@
     background: #fff;
     border-bottom: 1rpx solid #e3e3e3;
     padding: 32rpx 0;
-    border-bottom: 1rpx solid #eee;
     margin: 20rpx 0;
 }
 
@@ -118,4 +117,8 @@
   height: 100%;
   background-color: rgba(0, 0, 0, 0.5);
   z-index: 9999;
+}
+.refundImg{
+    width: 50rpx; 
+    height: 50rpx; 
 }