add

wechat/app.json

@@ -2,6 +2,7 @@
   "pages": [
     "pages/index/index",
     "pages/favorite/favorite",
+    "pages/pay-success/index",
     "pages/order/order",
     "pages/order-refund-detail/order-refund-detail",
     "pages/address/address",
@@ -16,7 +17,6 @@
     "pages/order-comment/order-comment",
     "pages/express-detail/express-detail",
     "pages/order-detail/order-detail",
-    "pages/pay-success/index",
     "pages/address-picker/address-picker",
     "pages/goods/goods",
     "pages/list/list",

wechat/commons/navbar/navbar.wxml

@@ -1,14 +1,14 @@
 <block wx:if="{{_navbar && _navbar.navs && _navbar.navs.length>0}}">
     <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}}'>
+            <navigator wx:if='{{item.open_type == "wxapp"}}' class="flex-grow-1 flex-y-center" url="{{item.url}}" open-type="wxapp" bindtap='naveClick' data-appid='{{item.appid}}' data-path='{{item.path}}' data-open_type='{{item.open_type}}'>
                 <view>
                     <image mode='widthFix' class="navbar-icon" src="{{item.active?item.active_icon:item.icon}}"></image>
                     <view class="navbar-text" style="color: {{item.active?item.active_color:item.color}};">{{item.text}}
                     </view>
                 </view>
             </navigator>
-            <navigator class="flex-grow-1 flex-y-center" url="{{item.url}}" open-type="tel" wx:elif='{{item.open_type == "tel"}}' bindtap='naveClick' data-tel='{{item.tel}}' data-open_type='{{item.open_type}}'>
+            <navigator wx:elif='{{item.open_type == "tel"}}' class="flex-grow-1 flex-y-center" url="{{item.url}}" open-type="tel" bindtap='naveClick' data-tel='{{item.tel}}' data-open_type='redirectTo'>
                 <view>
                     <image mode='widthFix' class="navbar-icon" src="{{item.active?item.active_icon:item.icon}}"></image>
                     <view class="navbar-text" style="color: {{item.active?item.active_color:item.color}};">{{item.text}}

wechat/pages/address-edit/address-edit.js

@@ -117,7 +117,7 @@ Page({
         console.log(myreg2.test(page.data.mobile));
         if (!myreg.test(page.data.mobile) && !myreg2.test(page.data.mobile)) {
             wx.showToast({
-                title: "联系电话格式不正确",
+                title: "电话格式不正确",
                 image: "/images/icon-warning.png",
             });
             return false;

wechat/pages/address-edit/address-edit.wxml

@@ -42,7 +42,7 @@
         <view style='width: 50%; text-align: right;'><switch bindchange='changeState' checked='{{is_default == 1}}'></switch></view>
     </view>
 
-    <view bindtap="getWechatAddress" class="get-wechat-address">一键获取微信地址</view> 
+    <!-- <view bindtap="getWechatAddress" class="get-wechat-address">一键获取微信地址</view>  -->
 
 </view>
 <include src="../../area-picker/area-picker.wxml"/>

wechat/pages/address-picker/address-picker.wxml

@@ -23,8 +23,8 @@
         <view class="flex-grow-1 px-24">
             <navigator class="btn btn-red" url="/pages/address-edit/address-edit">手动添加地址</navigator>
         </view>
-        <view class="flex-grow-1 px-24">
+        <!-- <view class="flex-grow-1 px-24">
             <button class="btn btn-green" bindtap="getWechatAddress">一键获取地址</button>
-        </view>
+        </view> -->
     </view> 
 </view>

wechat/pages/express-detail/express-detail.wxml

@@ -4,9 +4,20 @@
         <image src="{{data.goods_pic}}" style="width:120rpx;height:120rpx;margin-right: 24rpx" mode="aspectFill"></image>
     </view>
     <view class="flex-grow-1">
-        <view>物流状态：<text style="color:#25ae5f">{{data.status_text}}</text></view>
-        <view style="color: #888">快递公司：{{data.express}}</view>
-        <view style="color: #888">快递单号：{{data.express_no}}</view>
+        <view><text style="color: #EFA15E;">{{data.status_text}}</text></view>
+        <view style="color: #888;">{{data.express}}：{{data.express_no}}</view>
+        <view style="color: #888;">官方电话：<text style='color: #4994F7;'>{{data.phone}}</text></view>
+    </view>
+</view>
+<view class='bg-white flex' style='margin-bottom: 20rpx; padding: 30rpx 0;'>
+    <view class='flex-y-center'>
+        <image style='width: 50rpx; margin: 0 20rpx 0 20rpx;' mode='widthFix' src='/images/address.png'></image>
+    </view>
+    <view class='flex-y-center'>
+        <view style='color: #3B3B3B;'>
+            <view style='height: 60rpx;'>收货人： {{data.name}} {{data.phone}}</view>
+            <view>收货地址： {{data.address}}</view>
+        </view>
     </view>
 </view>
 <view class="data-list" wx:if="{{data.list&&data.list.length>0}}">
@@ -14,8 +25,8 @@
         <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>
+                <image class="point-gray" src="/images/icon-point-gray.png" style="width:32rpx; height: 32rpx; left: -15rpx "></image>
+                <image class="point-green" src="/images/icon-point-green.png" style="width:32rpx; height: 32rpx; left: -15rpx "></image>
             </view>
             <view class="item-line flex-grow-1"></view>
         </view>

wechat/pages/express-detail/express-detail.wxss

@@ -45,11 +45,11 @@
 
 .data-list .data-item .item-content{
     padding: 28rpx 0;
-    border-bottom: 1rpx solid #eee;
-    color: #888;
+    /* border-bottom: 1rpx solid #eee; */
+    color: #BBBABB;
 }
 .data-list .data-item:first-child .item-content{
-    color: #25ae5f;
+    color: #EFA15E;
 }
 
 .data-list .data-item:last-child .item-content{

wechat/pages/favorite/favorite.js

@@ -55,6 +55,42 @@ Page({
         });
     },
 
+    toGoods(e){
+        var id = e.currentTarget.dataset.id;
+        var status = e.currentTarget.dataset.status;
+        if(status == 0){
+            wx.showToast({
+                title: '该商品已下架',
+                icon: 'none'
+            })
+        }
+        else {
+            wx.navigateTo({
+                url: '/pages/goods/goods?id=' + id,
+            })
+        }
+    },
+
+    addCart: function (e) {
+        var id = e.currentTarget.dataset.id;
+        var attr = e.currentTarget.dataset.attr;
+        app.request({
+            url: api.cart.add_cart,
+            method: "POST",
+            data: {
+                goods_id: id,
+                attr: {},
+                num: 1,
+            },
+            success: function (res) {
+                wx.showToast({
+                    title: res.msg,
+                    duration: 1500
+                });
+            }
+        });
+    },
+
     /**
      * 生命周期函数--监听页面加载
      */

wechat/pages/favorite/favorite.wxml

@@ -1,20 +1,34 @@
 <!--pages/favorite/favorite.wxml-->
 <view>
-
     <scroll-view wx:for="{{goods.list}}" scroll-x="true" style=" white-space: nowrap;" >
-        <view class="goods-item">
-            <view class="flex-row">
-                <view class="flex-col">
-                    <image src="{{item.goods_pic}}" mode="asceptFill" style='width: 180rpx; height:180rpx;'></image>
-                </view>
-                <view class="flex-col">
-                    <view class="goods-info">
-                        <view class="goods-name">{{item.name}}</view>
-                        <view class='goods-unit'>单位：个</view>
-                        <view class="goods-price">￥{{item.price}}</view>
+        <view bindtap='toGoods' data-id='{{item.goods_id}}' data-status='{{item.status}}' class="goods-item">
+            <view class="cart-list">
+                <view class="cart-item flex-row" style='border: none;'>
+                    <view class="flex-grow-1">
+                        <view class="flex-grow-1 flex-row">
+                            <view class="flex-grow-0">
+                                <image src="{{item.goods_pic}}" mode="asceptFill" style='width: 180rpx; height:180rpx;'></image>
+                            </view>
+                            <view class="flex-grow-1 flex-col goods-info">
+                                <view class="flex-grow-1">
+                                    <view class="goods-name">
+                                        <navigator url="/pages/goods/goods?id={{item.goods_id}}">{{item.name}}</navigator>
+                                    </view>
+                                </view>
+                                <view class='goods-unit'>单位：{{item.unit}}</view>
+                                <view class="flex-grow-0 flex-row">
+                                    <view class="flex-grow-1 price">￥{{item.price}}</view>
+                                    <!-- <view>
+                                        <view class="flex-row">
+                                            <view bindtap='addCart' data-id='{{item.goods_id}}' data-attr='{{item.attr}}' class="row-data">加入购物车</view>
+                                        </view>
+                                    </view> -->
+                                </view>
+                            </view>
+                        </view>
                     </view>
-                </view> 
-            </view> 
+                </view>
+            </view>
         </view>
         <view bindtap='favoriteRemove' data-id='{{item.goods_id}}' class='delete'>
             <view class="flex-row">

wechat/pages/favorite/favorite.wxss

@@ -1,7 +1,13 @@
 /* pages/favorite/favorite.wxss */
+@import '../cart/cart.wxss';
 page{
     background: #fff;
 }
+.row-data{
+    color: #FF4544;
+    background: none;
+    width: 120rpx;
+}
 .goods-list{
     padding-top: 5rpx; 
 }

wechat/pages/goods/goods.js

@@ -38,6 +38,8 @@ Page({
             m: "--",
             s: "--",
         },
+        type: 0,
+        page: 1
     },
 
     /**
@@ -79,6 +81,14 @@ Page({
         page.getGoods();
         page.getCommentList();
     },
+    change: function(e){
+        var type = e.currentTarget.dataset.type;
+        this.setData({
+            type: type,
+            page: 1
+        })
+        this.getCommentList();
+    },
     getGoods: function () {
         var page = this;
         app.request({
@@ -131,27 +141,30 @@ Page({
     },
     getCommentList: function (more) {
         var page = this;
-        if (more && page.data.tab_comment != "active")
-            return;
-        if (is_loading_comment)
-            return;
-        if (!is_more_comment)
+        var p = page.data.page;
+        if (more)
             return;
+        // if (is_loading_comment)
+        //     return;
+        // if (!is_more_comment)
+        //     return;
         is_loading_comment = true;
         app.request({
             url: api.default.comment_list,
             data: {
                 goods_id: page.data.id,
                 page: p,
+                type: page.data.type
             },
             success: function (res) {
                 if (res.code != 0)
                     return;
                 is_loading_comment = false;
-                p++;
+                // p++; 
                 page.setData({
                     comment_count: res.data.comment_count,
                     comment_list: more ? page.data.comment_list.concat(res.data.list) : res.data.list,
+                    page: p++
                 });
                 if (res.data.list.length == 0)
                     is_more_comment = false;

wechat/pages/goods/goods.wxml

@@ -184,19 +184,19 @@
                 </view>
                 <view class="tab-group-item {{tab_comment}}">
                     <view class="comment-count flex-row">
-                        <view class="comment-count-item flex-grow-1 flex-x-center flex-col">
+                        <view bindtap='change' data-type='0' class="comment-count-item flex-grow-1 flex-x-center flex-col {{type==0 ? 'comment_active': ''}}">
                             <view>全部</view>
                             <view>({{comment_count.score_all>999?'999+':comment_count.score_all}})</view>
                         </view>
-                        <view class="comment-count-item flex-grow-1 flex-x-center flex-col">
+                        <view bindtap='change' data-type='3' class="comment-count-item flex-grow-1 flex-x-center flex-col {{type==3 ? 'comment_active': ''}}">
                             <view>好评</view>
                             <view>({{comment_count.score_3>999?'999+':comment_count.score_3}})</view>
                         </view>
-                        <view class="comment-count-item flex-grow-1 flex-x-center flex-col">
+                        <view bindtap='change' data-type='2' class="comment-count-item flex-grow-1 flex-x-center flex-col {{type==2 ? 'comment_active': ''}}">
                             <view>中评</view>
                             <view>({{comment_count.score_2>999?'999+':comment_count.score_2}})</view>
                         </view>
-                        <view class="comment-count-item flex-grow-1 flex-x-center flex-col">
+                        <view bindtap='change' data-type='1' class="comment-count-item flex-grow-1 flex-x-center flex-col {{type==1 ? 'comment_active': ''}}">
                             <view>差评</view>
                             <view>({{comment_count.score_1>999?'999+':comment_count.score_1}})</view>
                         </view>
@@ -222,16 +222,14 @@
                                     <text class="score-tag">差评</text>
                                 </view>
                                 -->
-                                <view class="mb-20">{{item.content}}</view>
-                                <view class="pic-list" wx:if="{{item.pic_list&&item.pic_list.length>0}}">
-                                    <image bindtap="commentPicView" wx:for="{{item.pic_list}}" wx:for-index="{{pic_index}}" data-index="{{index}}" data-pic-index="{{pic_index}}" src="{{item}}" mode="aspectFill" class="pic-item"></image>
+                                <view class="mb-20 content">{{item.content}}</view>
+                                <view class="pic-list" wx:if="{{item.pic_list&&item.pic_list.length>0&&item.pic_list[0]!=''}}">
+                                    <image wx:if="{{item}}!=''" bindtap="commentPicView" wx:for="{{item.pic_list}}" wx:for-index="{{pic_index}}" data-index="{{index}}" data-pic-index="{{pic_index}}" src="{{item}}" mode="aspectFill" class="pic-item"></image>
                                 </view>
                                 <view wx:if="{{item.reply_content}}" class="reply">商家: <view class="reply-content">{{item.reply_content}}</view></view>
                             </view>
                         </view>
                     </view>
-
-
                 </view>
             </view>
         </view>
@@ -249,14 +247,12 @@
                     <text>客服</text>
                 </view>
             </button>
-
-            <navigator class="flex-grow-0 flex-y-center bar-bottom-btn" url="/pages/index/index" open-type="redirect">
+            <button class="flex-grow-0 flex-y-center bar-bottom-btn" open-type="contact">
                 <view>
                     <image src="/images/icon-service-good.png"></image>
-                    <!-- <text>首页</text> -->
                     <text>客服</text>
                 </view>
-            </navigator>
+            </button> 
 
             <view wx:if="{{goods.is_favorite && goods.is_favorite==1}}" bindtap="favoriteRemove" class="flex-grow-0 flex-y-center bar-bottom-btn">
                 <view>

wechat/pages/goods/goods.wxss

@@ -543,4 +543,12 @@ view{
     height: 40rpx;
     line-height: 40rpx;
     margin: 0 8rpx;
+}
+.comment_active{
+    background: #ED5962;
+    color: #fff;
+}
+.content{
+    white-space: normal;
+    word-break: break-all;
 }

wechat/pages/index/index.wxml

@@ -1,9 +1,9 @@
 <include src="/commons/navbar/navbar" />
 <view class="after-navber">
-        <view class="purchase1" wx:if="{{buy_user}}">
-            <image class="purchase2" src="{{buy_avatar_url}}"></image>
-            <view class="purchase3">{{buy_user}}购买了{{buy_address}}, {{buy_time}}前</view>
-        </view>
+    <view class="purchase1" wx:if="{{buy_user}}">
+        <image class="purchase2" src="{{buy_avatar_url}}"></image>
+        <view class="purchase3">{{buy_user}}购买了{{buy_address}}, {{buy_time}}前</view>
+    </view>
 
     <block wx:for="{{module_list}}" wx:for-item="item" wx:for-index="index">
 
@@ -65,6 +65,63 @@
         </view>
         <!-- 搜索栏 结束 -->
 
+        
+        <!-- 热销 开始 -->
+        <view wx:elif="{{item.name=='rexiao'}}">
+            <view class="title-bar flex-y-center flex-x-center bg-white">
+                <view class="title-line"></view>
+                <view class="title flex-y-center">
+                    <!-- <image src="{{cat.pic_url}}" mode="aspectFill"></image> -->
+                    <text>热销</text>
+                </view>
+                <view class="title-line"></view>
+            </view>
+            <view wx:if="{{hot_cakes.length>0}}" style="background: #fff;margin-bottom: 10rpx;width:100%;overflow-x: hidden;">
+                <view class="goods-list flex-row goods-list-cols-{{cat_goods_cols}}">
+                    <view wx:for="{{hot_cakes}}" wx:for-index="goods_index" wx:for-item="goods" class="flex-grow-0 {{ goods_index %3 == 0 ? '' : 'goods-item_odd' }}">
+                        <navigator class="goods-item" url="/pages/goods/goods?id={{goods.id}}">
+                            <image src="{{goods.pic_url}}" mode="aspectFill" />
+                            <text class="text-more-2 text-more-1 {{cat_goods_cols == 3?'fs-sm':''}}" style='padding: 10rpx 10rpx 0;'>{{goods.name}}</text>
+                            <text class="goods-price" wx:if='{{cat_goods_cols == 3}}'>￥{{goods.price}}</text>
+                            <view class='flex-row' style='padding:10rpx 20rpx' wx:if='{{cat_goods_cols == 2}}'>
+                                <view class='flex-grow-1' style='color:#ff334b'>￥{{goods.price}}</view>
+                                <view class='fs-sm' style='color:#999;'>已售{{goods.sales}}</view>
+                            </view>
+                        </navigator>
+                    </view>
+                </view>
+            </view>
+        </view>
+        <!-- 热销 结束 -->
+        
+        <!-- 热销 开始 -->
+        <view wx:elif="{{item.name=='tuijian'}}">
+            <view class="title-bar flex-y-center flex-x-center bg-white">
+                <view class="title-line"></view>
+                <view class="title flex-y-center">
+                    <!-- <image src="{{cat.pic_url}}" mode="aspectFill"></image> -->
+                    <text>推荐</text>
+                </view>
+                <view class="title-line"></view>
+            </view>
+            <view wx:if="{{recommended.length>0}}" style="background: #fff;margin-bottom: 10rpx;width:100%;overflow-x: hidden;">
+                <view class="goods-list flex-row goods-list-cols-{{cat_goods_cols}}">
+                    <view wx:for="{{recommended}}" wx:for-index="goods_index" wx:for-item="goods" class="flex-grow-0 {{ goods_index %3 == 0 ? '' : 'goods-item_odd' }}">
+                        <navigator class="goods-item" url="/pages/goods/goods?id={{goods.id}}">
+                            <image src="{{goods.pic_url}}" mode="aspectFill" />
+                            <text class="text-more-2 text-more-1 {{cat_goods_cols == 3?'fs-sm':''}}" style='padding: 10rpx 10rpx 0;'>{{goods.name}}</text>
+                            <text class="goods-price" wx:if='{{cat_goods_cols == 3}}'>￥{{goods.price}}</text>
+                            <view class='flex-row' style='padding:10rpx 20rpx' wx:if='{{cat_goods_cols == 2}}'>
+                                <view class='flex-grow-1' style='color:#ff334b'>￥{{goods.price}}</view>
+                                <view class='fs-sm' style='color:#999;'>已售{{goods.sales}}</view>
+                            </view>
+                        </navigator>
+                    </view>
+                </view>
+            </view>
+        </view>
+        <!-- 热销 结束 -->
+        
         <!-- 导航图标 开始 -->
         <view wx:elif="{{item.name=='nav'}}">
             <view class="nav-icon-list flex-row" wx:if="{{nav_icon_list&&nav_icon_list.length>0}}">
@@ -158,7 +215,6 @@
         </view>
         <!-- 优惠券 结束 -->
 
-
         <!-- 全部分类 开始 -->
         <view wx:elif="{{item.name=='cat'}}">
             <block wx:for="{{cat_list}}" wx:for-index="cat_index" wx:for-item="cat">
@@ -167,13 +223,9 @@
                         <view class="title-line"></view>
                         <view class="title flex-y-center">
                             <image src="{{cat.pic_url}}" mode="aspectFill"></image>
-                            <text>{{cat.name}}</text>
+                            <text>{{cat.name}}</text> 
                         </view>
                         <view class="title-line"></view>
-                        <!-- <navigator class="flex-y-center" bindtap="hideGetCoupon" url="/pages/list/list?cat_id={{cat.id}}">
-                            <text>更多</text>
-                            <image src="/images/icon-jiantou-r.png" />
-                        </navigator> -->
                     </view>
                     <view class="goods-list flex-row goods-list-cols-{{cat_goods_cols}}">
                         <view class="flex-grow-0" wx:for="{{cat.goods_list}}" wx:for-index="goods_index" wx:for-item="goods">
@@ -190,7 +242,6 @@
                     </view>
                 </view>
             </block>
-
         </view>
         <!-- 全部分类 结束 -->
 
@@ -230,7 +281,6 @@
         </view>
         <!-- 拆分的分类 结束 -->
 
-
         <!-- 秒杀板块 开始 -->
         <block wx:elif="{{item.name=='miaosha'}}">
             <view class="user-block">

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

@@ -7,7 +7,7 @@ Page({
      * 页面的初始数据
      */
     data: {
-        goods_list: [],
+        goods_list: []
         // score: 5
     },
 
@@ -112,6 +112,15 @@ Page({
         var goods_list = page.data.goods_list;
         var siteinfo = app.siteInfo;
         var postData = {};
+        for (var i = 0; i < goods_list.length; i++) {
+            if (goods_list[i].content == '') {
+                wx.showToast({
+                    title: '评价不能为空',
+                    image: '/images/error.png'
+                })
+                return;
+            }
+        }
         if (siteinfo.uniacid != -1 && siteinfo != '-1') {
             postData._uniacid = siteinfo.uniacid;
             postData._acid = siteinfo.acid;
@@ -152,6 +161,8 @@ Page({
         }
 
         function submit() {
+            goods_list;
+            debugger;
             app.request({
                 url: api.order.comment,
                 method: "post",

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

@@ -6,7 +6,7 @@
                 <image class="goods-pic" src="{{item.goods_pic}}"></image>
             </view>
             <view class="flex-grow-1 flex-row">
-                 <text class="flex-y-center" style='margin-left: 40rpx;'>描述相符</text> 
+                 <text class="flex-y-center" style='margin-left: 40rpx;'>{{item.attr_name}}</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-{{item.score>1?'all':'zero'}}.png"></image>
@@ -16,23 +16,6 @@
                 </view>
                 <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"
-                      class="flex-grow-1 score-item flex-y-center flex-x-center {{item.score==3?'active':''}}">
-                    <image src="/images/icon-comment-score-3{{item.score==3?'.active':''}}.png"></image>
-                    <text>好评</text>
-                </view>
-                <view bindtap="setScore" data-index="{{index}}" data-score="2"
-                      class="flex-grow-1 score-item flex-y-center flex-x-center {{item.score==2?'active':''}}">
-                    <image src="/images/icon-comment-score-2{{item.score==2?'.active':''}}.png"></image>
-                    <text>中评</text>
-                </view>
-                <view bindtap="setScore" data-index="{{index}}" data-score="1"
-                      class="flex-grow-1 score-item flex-y-center flex-x-center {{item.score==1?'active':''}}">
-                    <image src="/images/icon-comment-score-1{{item.score==1?'.active':''}}.png"></image>
-                    <text>差评</text>
-                </view>
-            </view>  -->
         </view>
 
         <view class="flex-row content-row">

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

@@ -1,133 +1,135 @@
 <!--pages/order-detail/order-detail.wxml-->
 <view style="overflow-x: hidden">
-  <view class="status-bar">
-    <image src="/images/img-order-status-bar.png" mode="aspectFill"></image>
-    <text>{{order.status}}</text>
-  </view>
-
-  <navigator url="/pages/express-detail/express-detail?id={{order.order_id}}" class="block flex-row" wx:if="{{order.express_no && order.is_send==1}}">
-    <view class="flex-grow-1">
-      <view class="mb-10">快递公司：{{order.express}}</view>
-      <view class="">快递单号：{{order.express_no}}</view>
-    </view>
-    <view class="flex-grow-0 flex-y-center">
-      <image src="/images/icon-jiantou-r.png" style="width: 12rpx;height: 22rpx"></image>
+    <view class="status-bar">
+        <image src="/images/img-order-status-bar.png" mode="aspectFill"></image>
+        <text>{{order.status}}</text>
     </view>
 
-    <view class="block-row flex-row" wx:if="{{false}}">
-      <view class="flex-grow-1">快递单号：{{order.express_no}}</view>
-      <view class="flex-grow-0">
-        <text class="copy-text-btn" bindtap="copyText" data-text="{{order.express_no}}">复制</text>
-      </view>
-    </view>
-  </navigator>
+    <navigator url="/pages/express-detail/express-detail?id={{order.order_id}}" class="block flex-row" wx:if="{{order.express_no && order.is_send==1}}">
+        <view class="flex-grow-1">
+            <view class="mb-10">快递公司：{{order.express}}</view>
+            <view class="">快递单号：{{order.express_no}}</view>
+        </view>
+        <view class="flex-grow-0 flex-y-center">
+            <image src="/images/icon-jiantou-r.png" style="width: 12rpx;height: 22rpx"></image>
+        </view>
 
-  <view class="block">
-    <view class="flex-row block-row">
-      <view class="flex-grow-1">
-        收货人：{{order.name}}
-      </view>
-      <view class="flex-grow-0">
-        {{order.mobile}}
-      </view>
-    </view>
-    <view wx:if='{{order.address}}'>地址：{{order.address}}</view>
-  </view>
-  <block wx:if="{{order.is_offline == 1}}">
-    <view class="block flex-row">
-      <view class='flex-grow-1'>
-        <view class="flex-grow-1">门店名称：{{order.shop.name}}</view>
-        <view class="flex-grow-1">联系电话：{{order.shop.mobile}}</view>
-        <view class="flex-grow-1">门店地址：{{order.shop.address}}</view>
-      </view>
-      <view class='flex-grow-0 flex-y-center' wx:if='{{order.shop.longitude}}'>
-        <text class='copy-text-btn' bindtap='location'>导航</text>
-      </view>
-    </view>
-  </block>
+        <view class="block-row flex-row" wx:if="{{false}}">
+            <view class="flex-grow-1">快递单号：{{order.express_no}}</view>
+            <view class="flex-grow-0">
+                <text class="copy-text-btn" bindtap="copyText" data-text="{{order.express_no}}">复制</text>
+            </view>
+        </view>
+    </navigator>
 
-  <view class="block">
-    <view class="block-row flex-row">
-      <view class="flex-grow-1">订单编号：{{order.order_no}}</view>
-      <view class="flex-grow-0">
-        <text class="copy-text-btn" bindtap="copyText" data-text="{{order.order_no}}">复制</text>
-      </view>
-    </view>
-    <view>下单时间：{{order.addtime}}</view>
-    <view class='pay-type' wx:if='{{order.pay_type==0}}'>支付方式：未支付</view>
-    <view class='pay-type' wx:if='{{order.pay_type==1}}'>支付方式：微信支付</view>
-    <view class='pay-type' wx:if='{{order.pay_type==2}}'>支付方式：货到付款</view>
-    <view class='pay-type' wx:if='{{order.pay_type==3}}'>支付方式：账户余额支付</view>
-  </view>
+    <view class="block">
+        <view class="flex-row block-row">
+            <view class="flex-grow-1">
+                收货人：{{order.name}}
+            </view>
+            <view class="flex-grow-0">
+                {{order.mobile}}
+            </view>
+        </view>
+        <view wx:if='{{order.address}}'>收货地址：{{order.address}}</view>
+    </view>
+    <block wx:if="{{order.is_offline == 1}}">
+        <view class="block flex-row">
+            <view class='flex-grow-1'>
+                <view class="flex-grow-1">门店名称：{{order.shop.name}}</view>
+                <view class="flex-grow-1">联系电话：{{order.shop.mobile}}</view>
+                <view class="flex-grow-1">门店地址：{{order.shop.address}}</view>
+            </view>
+            <view class='flex-grow-0 flex-y-center' wx:if='{{order.shop.longitude}}'>
+                <text class='copy-text-btn' bindtap='location'>导航</text>
+            </view>
+        </view>
+    </block>
 
-  <view class="block">
-    <view class="flex-row block-row">
-      <view class="flex-grow-1">商品总额</view>
-      <view class="flex-grow-0" wx:if="{{order}}">￥{{order.goods_total_price}}</view>
-      <view class="flex-grow-0" wx:else>￥0.00</view>
-    </view>
-    <view class="flex-row block-row">
-      <view class="flex-grow-1">商品数量</view>
-      <view class="flex-grow-0">{{order.num}}件</view>
-    </view>
-    <view class="flex-row block-row" wx:if='{{user_coupon_id}}'>
-      <view class="flex-grow-1">优惠券优惠</view>
-      <view class="flex-grow-0">-￥{{order.coupon_sub_price}}</view>
-    </view>
-    <view class="flex-row block-row" wx:if='{{order.discount<10 && order.discount}}'>
-      <view class="flex-grow-1">会员折扣</view>
-      <view class="flex-grow-0">{{order.discount}}折</view>
-    </view>
-    <view class="flex-row block-row" wx:if="{{order.before_update}}">
-      <view class="flex-grow-1">{{order.before_update}}</view>
-      <view class="flex-grow-0">￥{{order.money}}</view>
-    </view>
-    <view class="flex-row block-row">
-      <view class="flex-grow-1">运费</view>
-      <view class="flex-grow-0">￥{{order.express_price}}</view>
-    </view>
-    <view wx:if='{{order.content}}'>
-      <view>买家留言</view>
-      <view style='width:100%;overflow:auto;word-wrap:break-word;'>{{order.content}}</view>
-    </view>
-    <view wx:if='{{order.words}}'>
-        <view>商家留言</view>
-      <view class='fs-sm' style='width:100%;overflow:auto;word-wrap:break-word;'>{{order.words}}</view>
+    <view class="block">
+        <view class="block-row flex-row">
+            <view class="flex-grow-1">订单编号：{{order.order_no}}</view>
+            <view class="flex-grow-0">
+                <text class="copy-text-btn" bindtap="copyText" data-text="{{order.order_no}}">复制</text>
+            </view>
+        </view>
+        <view>下单时间：{{order.addtime}}</view>
+        <view class='pay-type' wx:if='{{order.pay_type==0}}'>支付方式：未支付</view>
+        <view class='pay-type' wx:if='{{order.pay_type==1}}'>支付方式：微信支付</view>
+        <view class='pay-type' wx:if='{{order.pay_type==2}}'>支付方式：货到付款</view>
+        <view class='pay-type' wx:if='{{order.pay_type==3}}'>支付方式：账户余额支付</view>
     </view>
-    <view class="block-footer">合计：
-      <text style="color: #ff4544">￥{{order.pay_price}}</text>
+
+    <view class="block">
+        <view class="flex-row block-row">
+            <view class="flex-grow-1">商品总额</view>
+            <view class="flex-grow-0" wx:if="{{order}}">￥{{order.goods_total_price}}</view>
+            <view class="flex-grow-0" wx:else>￥0.00</view>
+        </view>
+        <view class="flex-row block-row">
+            <view class="flex-grow-1">商品数量</view>
+            <view class="flex-grow-0">{{order.num}}件</view>
+        </view>
+        <view class="flex-row block-row" wx:if='{{user_coupon_id}}'>
+            <view class="flex-grow-1">优惠券优惠</view>
+            <view class="flex-grow-0">-￥{{order.coupon_sub_price}}</view>
+        </view>
+        <view class="flex-row block-row" wx:if='{{order.discount<10 && order.discount}}'>
+            <view class="flex-grow-1">会员折扣</view>
+            <view class="flex-grow-0">{{order.discount}}折</view>
+        </view>
+        <view class="flex-row block-row" wx:if="{{order.before_update}}">
+            <view class="flex-grow-1">{{order.before_update}}</view>
+            <view class="flex-grow-0">￥{{order.money}}</view>
+        </view>
+        <view class="flex-row block-row">
+            <view class="flex-grow-1">运费</view>
+            <view class="flex-grow-0">￥{{order.express_price}}</view>
+        </view>
+        <view wx:if='{{order.content}}'>
+            <view class="flex-grow-1">买家留言</view>
+            <view class="flex-grow-0">{{order.content}}</view>
+        </view>
+        <view wx:if='{{order.words}}'>
+            <view class="flex-grow-1">商家留言</view>
+            <view class="flex-grow-0">{{order.words}}</view>
+        </view>
+        <view class="block-footer">合计：
+            <text style="color: #ff4544">￥{{order.pay_price}}</text>
+        </view>
     </view>
-  </view>
 
-  <view class="block">
-    <view wx:for="{{order.goods_list}}" class="flex-row goods-item">
-      <view class="flex-grow-0">
-        <navigator url="/pages/goods/goods?id={{item.goods_id}}" style="font-size: 0">
-          <image mode="aspectFill" style="width: 156rpx;height: 156rpx" src="{{item.goods_pic}}"></image>
-        </navigator>
-      </view>
-      <view class="flex-grow-1" style="padding-left: 20rpx">
-        <view style="margin-bottom: 10rpx">
-          <navigator url="/pages/goods/goods?id={{item.goods_id}}">{{item.name}}</navigator>
-        </view>
-        <view class="flex-row">
-          <view class="flex-grow-1">
-            <view style="font-size: 9pt;color: #888;margin-right: 20rpx;display: inline-block" wx:for="{{item.attr}}">
-              {{item.attr_group_name}}：{{item.attr_name}}
+    <view class="block">
+        <view wx:for="{{order.goods_list}}" class="flex-row goods-item">
+            <view class="flex-grow-0">
+                <navigator url="/pages/goods/goods?id={{item.goods_id}}" style="font-size: 0">
+                <image mode="aspectFill" style="width: 156rpx;height: 156rpx" src="{{item.goods_pic}}"></image>
+                </navigator>
             </view>
-          </view>
-          <view class="flex-grow-0" style="text-align: right">
-            <view>×{{item.num}}</view>
-            <view style="color: #ff4544">￥{{item.total_price}}</view>
-          </view>
-        </view>
-        <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_refund_id}}">退款中
-          </navigator>
-        </view>
-      </view>
+            <view class="flex-grow-1" style="padding-left: 20rpx">
+                <view style="margin-bottom: 10rpx">
+                    <navigator url="/pages/goods/goods?id={{item.goods_id}}">{{item.name}}</navigator>
+                </view>
+                <view class="flex-row">
+                    <view class="flex-grow-1">
+                        <view style="font-size: 9pt;color: #888;margin-right: 20rpx;display: inline-block" wx:for="{{item.attr}}">
+                        {{item.attr_group_name}}：{{item.attr_name}}
+                        </view>
+                    </view>
+                    <view class="flex-grow-0" style="text-align: right">
+                        <view>×{{item.num}}</view>
+                    </view>
+                </view>
+                <view class='flex-row'>
+                    <view style="color: #ff4544">￥{{item.total_price}}</view>
+                </view>
+                <view wx:if="{{item.order_refund_enable==1}}">
+                    <navigator wx:if="{{item.is_order_refund==0&&order.is_confirm==0}}" class="flex-y-center refund-btn" url="/pages/order-refund/order-refund?id={{item.order_detail_id}}">申请退款
+                    </navigator>
+                    <navigator wx:elif="{{item.is_order_refund==1&&order.is_confirm==0}}" class="flex-y-center refund-btn" url="/pages/order-refund-detail/order-refund-detail?id={{item.order_refund_id}}">已申请退款
+                    </navigator>
+                </view>
+            </view>
+        </view>
     </view>
-  </view>
 </view>

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

@@ -4,11 +4,11 @@ page{
 }
 .status-bar {
     box-sizing: border-box;
-    padding: 0 88rpx;
+    padding: 0 80rpx;
     color: #fff;
     font-size: 13pt;
-    height: 120rpx;
-    line-height: 120rpx;
+    height: 180rpx;
+    line-height: 180rpx;
     position: relative;
 }
 .status-bar image{

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

@@ -281,7 +281,7 @@ Page({
             var desc = page.data.refund_data_2.desc || "";
             if (desc.length == 0) {
                 wx.showToast({
-                    title: "请填写换货说明",
+                    title: "请填写退款说明",
                     image: "/images/icon-warning.png"
                 });
                 return;

wechat/pages/order-refund/order-refund.json

@@ -1,3 +1,3 @@
 {
-  "navigationBarTitleText": "申请售后"
+  "navigationBarTitleText": "申请退款"
 }

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

@@ -19,7 +19,7 @@
     </view>
      <view class="flex-row bg-white switch-tab mb-20">
         <view style='justify-content: center;' class="flex-grow-1 flex-x-center" bindtap="switchTab" data-id="1">
-            <text class="flex-y-center {{switch_tab_1}}">退货退款</text>
+            <text class="flex-y-center {{switch_tab_1}}">退货</text>
         </view>
         <view style='justify-content: center;' class="flex-grow-1 flex-x-center" bindtap="switchTab" data-id="2">
             <text class="flex-y-center {{switch_tab_2}}">退款</text>
@@ -37,7 +37,7 @@
             </view>
             <view class='reason-item'>
                 <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>
@@ -50,11 +50,11 @@
                 <text class="form-label">上传凭证</text>
             </view> -->
             <view class="mb-20">
-                <textarea placeholder='请填写退款说明...'></textarea>
+                <textarea placeholder='请填写退货说明...'></textarea>
             </view> 
             <view class="image-list">
                 <view class="image-preview" wx:for="{{refund_data_1.pic_list}}" data-index="{{index}}">
-                    <text class="flex-x-center flex-y-center image-del" bindtap="deleteImage" data-type="1"
+                    <text class="flex-y-center image-del" style='justify-content: center;' bindtap="deleteImage" data-type="1"
                           data-index="{{index}}">×
                     </text>
                     <image src="{{item}}" style="width: 160rpx;height: 160rpx" mode="aspectFill"></image>
@@ -70,11 +70,11 @@
      <view class="switch-body {{switch_tab_2}}">
         <view class="flex-row bg-white form-row mb-20">
             <view class="flex-grow-0">
-                <text class="form-label">换货说明</text>
+                <text class="form-label">退款说明</text>
             </view>
             <view class="flex-grow-1">
                 <textarea style="width: 100%;padding: 0;" rows="2" bindinput="descInput" data-type="2"
-                          placeholder="请输入换货说明"></textarea>
+                          placeholder="请输入退款说明"></textarea>
             </view>
         </view>
         <view class="bg-white form-row mb-20">
@@ -83,7 +83,7 @@
             </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"
+                    <text class="flex-x-center flex-y-center image-del" style='justify-content: center;' bindtap="deleteImage" data-type="2"
                           data-index="{{index}}">×
                     </text>
                     <image src="{{item}}" style="width: 160rpx;height: 160rpx" mode="aspectFill"></image>

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

@@ -61,8 +61,8 @@
     position: absolute;
     top:-15rpx;
     right: -15rpx;
-    height: 50rpx;
-    width: 50rpx;
+    height: 30rpx;
+    width: 30rpx;
     background: #ff4544;
     color: #fff;
     font-weight: bolder;

wechat/pages/order-submit/order-submit.js

@@ -252,9 +252,7 @@ Page({
                                         signType: res.data.signType,
                                         paySign: res.data.paySign,
                                         success: function (e) {
-                                            // wx.redirectTo({
-                                            //     url: "/pages/order/order?status=1",
-                                            // });
+
                                         },
                                         fail: function (e) {
                                         },
@@ -282,14 +280,14 @@ Page({
                                                     });
                                                 } else {
                                                     wx.redirectTo({
-                                                        url: "/pages/order/order?status=-1",
-                                                    });
+                                                        url: '/pages/pay-success/index'
+                                                    })
                                                 }
                                                 return;
                                             }
                                             wx.redirectTo({
-                                                url: "/pages/order/order?status=-1",
-                                            });
+                                                url: '/pages/pay-success/index'
+                                            })
                                         },
                                     });
 

wechat/pages/order-submit/order-submit.wxml

@@ -136,7 +136,7 @@
     </block>
 
 
-    <view bindtap="showCouponPicker" class="flex-row flex-y-center" style="background: #fff;padding: 0 24rpx;height: 90rpx;border-bottom: 1rpx solid #e3e3e3;{{integral.forehead_integral>0?'':'margin-bottom: 20rpx;'}}">
+    <!-- <view bindtap="showCouponPicker" class="flex-row flex-y-center" style="background: #fff;padding: 0 24rpx;height: 90rpx;border-bottom: 1rpx solid #e3e3e3;{{integral.forehead_integral>0?'':'margin-bottom: 20rpx;'}}">
         <view class="flex-grow-1">优惠券</view>
         <view class="flex-grow-0">
             <view wx:if="{{!coupon_list||coupon_list.length==0}}" style="color: #888">目前无可用优惠券</view>
@@ -148,7 +148,7 @@
         <view class="flex-grow-0">
             <image src="/images/icon-jiantou-r.png" style="width: 12rpx;height: 22rpx;margin-left: 12rpx"></image>
         </view>
-    </view>
+    </view> -->
     <view class="flex-row flex-y-center" style="background: #fff;padding: 0 24rpx;height: 90rpx;border-bottom: 1rpx solid #e3e3e3;" wx:if="{{integral.forehead_integral > 0}}">
         <view class="flex-grow-1 flex-y-center">
             <view class='flex-y-center'>使用{{integral.forehead_integral}}积分抵扣</view>

wechat/pages/order/order.js

@@ -157,6 +157,9 @@ Page({
                         success: function (e) {
                             console.log("success");
                             console.log(e);
+                            wx.redirectTo({
+                                url: '/pages/pay-success/index'
+                            })
                         },
                         fail: function (e) {
                             console.log("fail");
@@ -182,9 +185,9 @@ Page({
                                 });
                                 return;
                             }
-                            wx.redirectTo({
-                                url: "/pages/order/order?status=1",
-                            });
+                            // wx.redirectTo({
+                            //     url: "/pages/order/order?status=1",
+                            // });
                         },
                     });
                 }
@@ -228,9 +231,13 @@ Page({
 
     orderRevoke: function (e) {
         var page = this;
+        var content = '是否申请退款';
+        if (e.currentTarget.dataset.type) {
+            content = '是否取消该订单？'
+        }
         wx.showModal({
             title: "提示",
-            content: "是否取消该订单？",
+            content: content,
             cancelText: "否",
             confirmText: "是",
             success: function (res) {
@@ -364,6 +371,54 @@ Page({
                 }
             }
         });
+    },
+    orderDel: function (e) {
+        var page = this;
+        app.request({
+            url: api.order.order_del,
+            data: {
+                order_id: e.currentTarget.dataset.id,
+            },
+            success: function (res) {
+                if (res.code == 0) {
+                    wx.showToast({
+                        title: res.msg
+                    })
+                    setTimeout(function () {
+                        page.loadOrderList(3);
+                    }, 2000)
+                }
+                else {
+                    wx.showToast({
+                        title: res.msg
+                    })
+                }
+            }
+        });
+    },
+    remindSend: function(e){
+        var page = this;
+        app.request({
+            url: api.order.remind_send,
+            data: {
+                order_id: e.currentTarget.dataset.id,
+            },
+            success: function (res) {
+                debugger;
+                if (res.code == 0) {
+                    wx.showToast({
+                        title: res.msg,
+                        icon: 'none'
+                    })
+                }
+                else {
+                    wx.showToast({
+                        title: res.msg,
+                        icon: 'none'
+                    })
+                }
+            }
+        });
     }
 
 });

wechat/pages/order/order.wxml

@@ -25,7 +25,7 @@
     </view>
     <view class="flex-grow-1">
         <navigator class="{{status==4?'active':''}}" url="/pages/order/order?status=4" open-type="redirect">
-            <text>售后</text>
+            <text>退款</text>
         </navigator>
     </view> 
 </view>
@@ -79,27 +79,35 @@
                     <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>
+                    <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==1}}">已拒绝退货</view>
                         <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}}">
+                    <view class="flex-grow-1" wx:if="{{order.is_send==0 && order.is_pay==0}}">
                         <text wx:if="{{order.apply_delete==1}}">取消申请中</text>
-                        <button wx:else class="order-option-btn" bindtap="orderRevoke" data-id="{{order.order_id}}">取消
+                        <button wx:else class="order-option-btn" bindtap="orderRevoke" data-type='cancel' data-id="{{order.order_id}}">取消
+                        </button>
+                    </view>
+                    <view class="flex-grow-1" wx:if="{{order.is_send==0 && order.is_pay==1}}">
+                        <text wx:if="{{order.apply_delete==1}}">退款申请中</text>
+                        <button wx:else class="order-option-btn" bindtap="orderRevoke" data-id="{{order.order_id}}">申请退款
                         </button>
                     </view>
                     <view class="flex-grow-1" wx:if="{{order.is_pay==0}}">
-                        <button class="order-option-btn" bindtap="orderPay" data-id="{{order.order_id}}">付款</button>
+                        <button class="order-option-btn order-red-btn" bindtap="orderPay" data-id="{{order.order_id}}">付款</button>
                     </view>
                     <view class="flex-grow-1" wx:if="{{order.is_pay == 1 && order.is_offline == 1 && order.is_send == 0 && order.apply_delete==0}}">
                         <view class="order-option-btn clerk flex-y-center" bindtap="orderQrcode" data-index="{{index}}">
                             <image src="/images/icon-clerk.png" style='width:26rpx;height:26rpx;margin-right:10rpx' data-index="{{index}}" /> 核销码
                         </view>
                     </view>
+                    <view class="flex-grow-1" wx:if="{{order.is_pay==1&&order.is_send==0}}">
+                        <button class="order-option-btn order-red-btn order-red-btn" bindtap="remindSend" data-id="{{order.order_id}}">提醒发货</button>
+                    </view>
                     <view class="flex-grow-1 flex-row" wx:if="{{order.is_send==1&&order.is_confirm==0}}">
                         <view class="flex-grow-0" wx:if='{{order.express}}'>
                             <navigator class="order-option-btn" url="/pages/express-detail/express-detail?id={{order.order_id}}">物流
@@ -114,6 +122,11 @@
                         <navigator class="order-option-btn" url="/pages/order-comment/order-comment?id={{order.order_id}}">评价
                         </navigator>
                     </view>
+                    <!-- <view class="flex-grow-1" wx:elif="{{order.is_send==1&&order.is_confirm==1&&order.is_comment==1}}">
+                        <view class="order-option-btn">已评价
+                        </view>
+                    </view> -->
+                    <view bindtap='orderDel' data-id='{{order.order_id}}' class='flex-grow-1 order-option-btn' wx:if="{{order.is_confirm==1}}">删除订单</view>
                 </block>
             </view>
         </view>

wechat/pages/order/order.wxss

@@ -95,6 +95,10 @@
 .order-option-btn::after{
     display: none;
 }
+.order-red-btn{
+    border: 1rpx solid #EB4851;
+    color: #EB4851;
+}
 
 .return-index-btn{
     position: fixed;

wechat/pages/pay-success/index.wxml

@@ -6,10 +6,14 @@
     </view>
     <view>
         <view style='display: inline-block;'>
-            <button class='btn_bg_red' size='mini'>返回首页</button>
+            <navigator url='/pages/index/index' open-type="redirect">
+                <button class='btn_bg_red' size='mini'>返回首页</button>
+            </navigator>
         </view>
         <view style='display: inline-block;'>
-            <button class='btn_bg_white' size='mini'>查看订单</button>
+            <navigator url='/pages/order/order?status=1' open-type="redirect">
+                <button class='btn_bg_white' size='mini'>查看订单</button>
+            </navigator>
         </view>
     </view>
 </view>

wechat/pages/search/search.js

@@ -18,13 +18,23 @@ Page({
         show_history: true,
         show_result: false,
         history_list: [],
+        info: false
     },
 
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
+        var that = this;
         app.pageOnLoad(this);
+        app.request({
+            url: api.default.search_key,
+            success: function (res) {
+                that.setData({
+                    keyword: res.data
+                })
+            }
+        });
 
     },
 
@@ -124,6 +134,11 @@ Page({
                     page.setData({
                         goods_list: res.data.list
                     });
+                    if(res.data.list.length == 0){  
+                        page.setData({
+                            info: true
+                        })
+                    }
                 }
                 if (res.code == 1) {
                 }
@@ -154,6 +169,11 @@ Page({
     setHistory: function (keyword) {
         var page = this;
         var history_list = page.getHistoryList();
+        for (var i = 0; i < history_list.length; i++){
+            if (keyword == history_list[i].keyword){
+                return;
+            }
+        }
         history_list.push({
             keyword: keyword,
         });

wechat/pages/search/search.wxml

@@ -9,7 +9,7 @@
                             <image class="search-icon" src="/images/icon-search.png"/>
                         </view>
                         <view style="width: 100%">
-                            <input style="width: 100%" confirm-type="search" class="search-input" auto-focus="true"
+                            <input style="width: 100%; text-align: center;" placeholder='{{keyword}}' confirm-type="search" class="search-input" auto-focus="true"
                                    bindconfirm="inputConfirm"
                                    bindfocus="inputFocus" bindblur="inputBlur"/>
                         </view>
@@ -20,6 +20,9 @@
                 </view>
             </form>
         </view>
+        <view wx:if='{{info}}' style='text-align: center;'>
+            暂无该商品
+        </view>
         <view style="flex-grow: 1;position: relative">
             <scroll-view scroll-y="true" style="height:100%;width:100%;position: absolute;left: 0;top:0"
                          lower-threshold="5" bindscrolltolower="onListScrollBottom">

wechat/pages/user/user.wxml

@@ -20,7 +20,6 @@
             </view>
             <view class="flex-grow-0 flex-y-center userinfo-addr">
                 <navigator class="my-address flex-y-center" url="/pages/address/address">
-                    <!-- <image src="/images/icon-address.png" /> -->
                     <text>收货地址 </text>
                     <image style='width: 15rpx;' mode='widthFix' src='/images/jinatou-white.png'></image>
                 </navigator>
@@ -85,40 +84,6 @@
         </block>
     </view>
 
-    <!-- <block wx:if='{{wallet || wallet.length==0}}'>
-        <view class='wallet flex-row'>
-            <view class='flex-grow-0 wallet-1 flex-x-center flex-y-center' style="{{wallet.re == 1 ? 'width:150rpx;' :''}}">
-                <view>
-                    <view class='flex-x-center'>
-                        <image src='/images/icon-user-wallet.png' style='width:48rpx;height:48rpx;margin-bottom:20rpx;'></image>
-                    </view>
-                    <view class='fs-sm'>我的钱包</view>
-                </view>
-            </view>
-            <view class='flex-grow-0 {{wallet.re == 1 ? "wallet-3" : "wallet-2"}} flex-x-center flex-y-center'>
-                <view class='flex-grow-1 flex-y-center flex-col'>
-                    <view class='num-1 flex-x-center'>{{user_info.integral}}</view>
-                    <view class='flex-row num-2'>
-                        <image src='/images/icon-user-integral.png' class='flex-grow-0' style='width:26rpx;height:26rpx;margin-right:10rpx;'></image>
-                        <view class='flex-grow-0'>积分</view>
-                    </view>
-                </view>
-            </view>
-            <block wx:if='{{wallet.re == 1}}'>
-                <view class='flex-grow-0 {{wallet.re == 1 ? "wallet-3" : "wallet-2"}}  flex-x-center flex-y-center'>
-                    <view class='flex-grow-1 flex-y-center flex-col'>
-                        <navigator url='/pages/balance/balance' hover-class='none'>
-                            <view class='num-1 flex-x-center'>{{user_info.money}}</view>
-                            <view class='flex-row num-2'>
-                                <image src='/images/icon-user-balance.png' class='flex-grow-0' style='width:26rpx;height:26rpx;margin-right:10rpx;'></image>
-                                <view class='flex-grow-0'>余额</view>
-                            </view>
-                        </navigator>
-                    </view>
-                </view>
-            </block>
-        </view>
-    </block> -->
     <view class="order-block">
         <navigator style='border-bottom: 1rpx solid #eee;' class="option-item" url="/pages/order/order?status=-1">
             <view style='border: none;' class="flex-row option-content">
@@ -172,6 +137,9 @@
                         <image src="{{orders.status_3.icon?orders.status_3.icon:'/images/icon-order-0.png'}}" />
                     </view>
                     <view>{{orders.status_3.text?orders.status_3.text:'已完成'}}</view>
+                    <view class="num-icon" wx:if="{{order_count.status_3 && order_count.status_3 > 0}}">
+                        {{order_count.status_3}}
+                    </view>
                 </navigator>
             </view>
             <!-- <view class="flex-grow-1">
@@ -179,7 +147,7 @@
                     <view>
                         <image src="{{orders.status_4.icon?orders.status_4.icon:'/images/icon-order-0.png'}}" />
                     </view>
-                    <view>{{orders.status_4.text?orders.status_4.text:'售后'}}</view>
+                    <view>{{orders.status_4.text?orders.status_4.text:'退款'}}</view>
                 </navigator>
             </view> -->
         </view>