add

wechat/app.js

@@ -5,7 +5,7 @@ App({
     is_on_launch: true,
     onLaunch: function () {
         let extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {};
-        var uniacid = JSON.stringify(extConfig) != "{}" ? extConfig.uniacid : '20910';
+        var uniacid = JSON.stringify(extConfig) != "{}" ? extConfig.uniacid : '20236';
         this.siteInfo.uniacid = uniacid;
         this.siteInfo.acid = uniacid;
         wx.setStorageSync("store_id", uniacid);

wechat/app.json

@@ -1,20 +1,26 @@
 {
   "pages": [
+    "pages/express-company/express-company",
+    "pages/express-orderid/express-orderid",
+    "pages/order-refund/order-refund",
+    "pages/order-refund-reason/order-refund-reason",
+    "pages/order-comment/order-comment",
+    "pages/express-detail/express-detail",
+    "pages/order-detail/order-detail",
+    "pages/user/user",
+    "pages/pay-success/index",
+    "pages/address-edit/address-edit",
+    "pages/address-picker/address-picker",
     "pages/index/index",
     "pages/cart/cart",
     "pages/goods/goods",
     "pages/list/list",
-    "pages/user/user",
     "pages/search/search",
     "pages/order-submit/order-submit",
     "pages/order/order",
-    "pages/order-detail/order-detail",
     "pages/address/address",
-    "pages/address-edit/address-edit",
-    "pages/address-picker/address-picker",
     "pages/test/test",
     "pages/favorite/favorite",
-    "pages/order-refund/order-refund",
     "pages/order-refund-detail/order-refund-detail",
     "pages/add-share/index",
     "pages/share/index",
@@ -24,10 +30,8 @@
     "pages/share-team/share-team",
     "pages/share-order/share-order",
     "pages/share-qrcode/share-qrcode",
-    "pages/order-comment/order-comment",
     "pages/article-list/article-list",
     "pages/article-detail/article-detail",
-    "pages/express-detail/express-detail",
     "pages/cat/cat",
     "pages/coupon/coupon",
     "pages/clerk/clerk",

wechat/app.wxss

@@ -39,6 +39,7 @@ map,
 canvas,
 contact-button {
     box-sizing: border-box;
+    font-family: "yahei"
 }
 button{
     font-size: 11pt;
@@ -411,6 +412,12 @@ button[plain]{
   -webkit-box-orient: vertical;
   word-break: break-all;
 }
+.text-more-1 {
+  -webkit-line-clamp: 1;
+  text-align: center;
+  font-size: 28rpx;
+  padding: 10rpx 10rpx 0;
+}
 
 .no-scroll {
   height: 100%;
@@ -438,4 +445,15 @@ button[plain]{
 
 .navbar button::after{
     display: none;
+}
+
+.btn_bg_red{
+    border: 1px solid #EB4851;
+    background: #EB4851;
+    color: #ffffff;
+}
+.btn_bg_white{
+    border: 1px solid #EB4851;
+    color: #EB4851;
+    background: #ffffff;
 }

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

@@ -1,27 +1,27 @@
 <!--pages/address-edit/address-edit.wxml-->
 <view class="bottom-bar">
-    <navigator bindtap="saveAddress">保存</navigator>
+    <navigator bindtap="saveAddress">提交保存</navigator>
 </view>
 <view>
     <view class="flex-row flex-y-center edit-row">
         <view class="flex-grow-0 row-label">收货人</view>
         <view class="flex-grow-1">
-            <input placeholder="" value="{{name}}" data-name="name" bindinput="inputBlur"/>
+            <input placeholder="请填写" value="{{name}}" data-name="name" bindinput="inputBlur"/>
         </view>
     </view>
 
     <view class="flex-row flex-y-center edit-row">
         <view class="flex-grow-0 row-label">联系电话</view>
         <view class="flex-grow-1">
-            <input placeholder="" value="{{mobile}}" data-name="mobile" type="number" bindinput="inputBlur"/>
+            <input placeholder="请填写" value="{{mobile}}" data-name="mobile" type="number" bindinput="inputBlur"/>
         </view>
     </view>
 
     <view class="flex-row flex-y-center edit-row">
-        <view class="flex-grow-0 row-label">所在地区</view>
+        <view class="flex-grow-0 row-label">省/市/县</view>
         <view class="flex-grow-1 flex-row" bindtap="showAreaPicker">
             <view class="flex-grow-1" style="text-align: right;padding-right: 24rpx">
-                <block wx:if="{{district==null}}">请选择</block>
+                <block wx:if="{{district==null}}" style="color: #808080;">请选择</block>
                 <block wx:else>{{district.province.name}} {{district.city.name}} {{district.district.name}}</block>
             </view>
             <view class="flex-grow-0 flex-y-center">
@@ -31,13 +31,17 @@
     </view>
 
     <view class="flex-row flex-y-center edit-row">
-        <view class="flex-grow-0 row-label">详细地址</view>
+        <view class="flex-grow-0 row-label">街道</view>
         <view class="flex-grow-1">
-            <input placeholder="" value="{{detail}}" data-name="detail" bindinput="inputBlur"/>
+            <input placeholder="请填写详细地址" value="{{detail}}" data-name="detail" bindinput="inputBlur"/>
         </view>
     </view>
 
-    <view bindtap="getWechatAddress" class="get-wechat-address">一键获取微信地址</view>
+    <!-- <view bindtap="getWechatAddress" class="get-wechat-address">一键获取微信地址</view> -->
 
 </view>
+<view class='setting flex-row'>
+    <view style='width: 50%;'>设为默认</view>
+    <view style='width: 50%; text-align: right;'><switch></switch></view>
+</view>
 <include src="../../area-picker/area-picker.wxml"/>

wechat/pages/address-edit/address-edit.wxss

@@ -44,4 +44,9 @@
 
 .get-wechat-address:active{
     opacity: .85;
+}
+.setting {
+    background: #ffffff;
+    margin-top: 15rpx;
+    padding: 15rpx;
 }

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

@@ -14,12 +14,17 @@
             </view>
         </bloc>
     </view>
-    <view class="flex-row">
+    <view class="btn btn-red">
+        <navigator url="/pages/address-edit/address-edit">
+            <image src='/images/add.png'></image>   手动添加地址
+        </navigator>
+    </view>
+    <!-- <view class="flex-row">
         <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">
             <button class="btn btn-green" bindtap="getWechatAddress">一键获取地址</button>
         </view>
-    </view>
+    </view> -->
 </view>

wechat/pages/address-picker/address-picker.wxss

@@ -7,7 +7,6 @@
     z-index: 1000;
 }
 
-
 .bottom-bar navigator{
     background: #ff4544;
     text-align: center;
@@ -28,8 +27,6 @@
 .userinfo{
     margin-bottom: 24rpx;
 }
-.address-detail{
-}
 .address-option{
     margin-left: 48rpx;
 }
@@ -41,15 +38,20 @@
 }
 
 .btn{
-    display: block;
+    /* display: block; */
     border: 1rpx solid #ddd;
+    position: fixed;
+    bottom: 0;
+    width: 100%;
     font-size: 11pt;
-    color: #555;
-    padding: 16rpx;
+    /* color: #555; */
+    padding: 25rpx 0;
     line-height: normal;
-    background: #fff;
-    border-radius: 10rpx;
-    text-align: center;
+    /* background: #fff; */
+    /* border-radius: 10rpx; */
+    display: flex;
+    align-items: center;
+    justify-content: center;
 }
 
 .btn:active{
@@ -67,7 +69,11 @@
     border-color: #09bb07;
 }
 .btn.btn-red{
-    background: #ff4544;
+    background: #EB4851;
     color: #fff;
-    border-color: #ff4544;
+    /* border-color: #ff4544; */
+}
+.btn image{
+    width: 30rpx; 
+    height: 30rpx;
 }

wechat/pages/cart/cart.wxml

@@ -8,7 +8,7 @@
                 <text style="white-space: nowrap">全选</text>
             </view>
             <view class="flex-grow-1" style="color:#ff4544;white-space: nowrap">
-                总计:￥{{total_price}}
+                总计： ￥{{total_price}}
             </view>
         </view>
         <block wx:if="{{show_cart_edit}}">

wechat/pages/cart/cart.wxss

@@ -15,7 +15,7 @@
 }
 
 .bottom-bar .submit-btn{
-    background: #ff4544;
+    background: #EC554D;
     color: #fff;
     width: 160rpx;
     text-align: center;

wechat/pages/express-company/express-company.js

@@ -0,0 +1,73 @@
+// pages/express-company/express-company.js
+var wxSortPickerView = require('../../wxSortPickerView/wxSortPickerView.js');
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+    
+    },
+
+    //处理:accept:接受点击返回的文字
+    wxSortPickerViewItemTap: function (e) {
+        console.log(e.target.dataset.text);
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+        var that = this;
+        wxSortPickerView.init(["顺丰快递", "申通快递", "韵达快递", "圆通速递", "中通速递", "百世快递", "EMS", "天天快递", "邮政平邮/小包", "宅急送", "国通快递", "全峰快递", "优速快递", "中铁快运", "中铁物流", "亚马逊物流", "城际快递", "德邦", "汇丰物流", "安捷快递", "安能物流", "安信达快递", "北青小红帽", "百福东方"], that);
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+    
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+    
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+    
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+    
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+    
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+    
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+    
+    }
+})

wechat/pages/express-company/express-company.json

@@ -0,0 +1,3 @@
+{
+    "navigationBarTitleText": "物流公司"
+}

wechat/pages/express-company/express-company.wxml

@@ -0,0 +1,4 @@
+<!--pages/express-company/express-company.wxml-->
+<import src="../../wxSortPickerView/wxSortPickerView.wxml"/> 
+
+<template is="wxSortPickerView" data="{{wxSortPickerData}}"/>

wechat/pages/express-company/express-company.wxss

@@ -0,0 +1,5 @@
+/* pages/express-company/express-company.wxss */
+@import "../../wxSortPickerView/wxSortPickerView.wxss";
+page{
+     background: #ffffff; 
+}

wechat/pages/express-orderid/express-orderid.js

@@ -0,0 +1,66 @@
+// pages/express-orderid/express-orderid.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+  
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+  
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+  
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+  
+  }
+})

wechat/pages/express-orderid/express-orderid.json

@@ -0,0 +1,3 @@
+{
+    "navigationBarTitleText": "填写运单号"
+}

wechat/pages/express-orderid/express-orderid.wxml

@@ -0,0 +1,18 @@
+<!--pages/express-orderid/express-orderid.wxml-->
+<view class='reason-item'>
+    <navigator url='/pages/express-company/express-company' class="flex-grow-1 flex-row">
+        物流公司
+        <view class="flex-grow-1 flex-x-center flex-y-center" style='color: #979A9B;'>
+            请选择
+            <image style='width:12rpx; margin-left: 20rpx;' mode='widthFix' src='/images/icon-jiantou-r.png'></image>
+        </view>
+    </navigator> 
+</view>
+<view class='reason-item' style='border: none;'>
+    <view class="flex-grow-1 flex-row">
+        <view class="flex-y-center" style='width: 100%;'>
+            <text style='margin-right: 20rpx;'>物流单号</text>
+            <input style='width: 80%;' placeholder='填写运单号'></input>
+        </view>
+    </view> 
+</view>

wechat/pages/express-orderid/express-orderid.wxss

@@ -0,0 +1,2 @@
+/* pages/express-orderid/express-orderid.wxss */
+@import "../order-refund-reason/order-refund-reason.wxss";

wechat/pages/goods/goods.wxml

@@ -117,7 +117,7 @@
         </view>
 
         <view class="goods-info" style="background: #fff;padding:32rpx 24rpx;border-bottom: 1rpx solid #eee ">
-            <view style="font-weight: bold;margin-bottom: 24rpx;line-height: 1.7">{{goods.name}}</view>
+            <view style="font-weight: bold;">{{goods.name}}</view>
             <view class="flex-row flex-y-center">
                 <view class="flex-grow-1 flex-row flex-y-bottom">
                     <block wx:if="{{goods && goods.miaosha}}">
@@ -137,13 +137,13 @@
                         </view>
                     </block>
                     <view class="flex-grow-0" style="margin-right: 32rpx">
-                        <text style="font-size: 9pt;color: #888;">销量：{{goods.sales_volume}} {{goods.unit}}</text>
+                        <text style="font-size: 9pt;color: #888;">销量 {{goods.sales_volume}} {{goods.unit}}</text>
                     </view>
                 </view>
 
                 <view class="flex-grow-0">
                     <button bindtap="showShareModal" class="share-btn" plain="true">
-                        <image style="width: 40rpx;height: 40rpx" src="/images/icon-share.png" />
+                        <image style="width: 40rpx;height: 40rpx" src="/images/icon-share-red.png" />
                         <view style="color: #888">分享</view>
                     </button>
                 </view>
@@ -239,6 +239,7 @@
     </view>
     <navigator url="/pages/cart/cart" class="cart-nav" open-type="redirect">
         <image src="/images/nav-icon-cart.png"></image>
+        <view class='budge'>10</view>
     </navigator>
     <view class="flex-row bar-bottom">
         <view class="flex-grow-0 flex-row">
@@ -251,20 +252,21 @@
 
             <navigator class="flex-grow-0 flex-y-center bar-bottom-btn" url="/pages/index/index" open-type="redirect">
                 <view>
-                    <image src="/images/icon-store.png"></image>
-                    <text>首页</text>
+                    <image src="/images/icon-service-good.png"></image>
+                    <!-- <text>首页</text> -->
+                    <text>客服</text>
                 </view>
             </navigator>
 
             <view wx:if="{{goods.is_favorite && goods.is_favorite==1}}" bindtap="favoriteRemove" class="flex-grow-0 flex-y-center bar-bottom-btn">
                 <view>
-                    <image src="/images/icon-favorite-active.png"></image>
+                    <image src="/images/icon-favorite-star-active.png"></image>
                     <text>已收藏</text>
                 </view>
             </view>
             <view wx:else bindtap="favoriteAdd" class="flex-grow-0 flex-y-center bar-bottom-btn">
                 <view>
-                    <image src="/images/icon-favorite.png"></image>
+                    <image src="/images/icon-favorite-star.png"></image>
                     <text>收藏</text>
                 </view>
             </view>

wechat/pages/goods/goods.wxss

@@ -65,6 +65,7 @@ view{
     font-size: 8pt;
     color: #888;
     display: block;
+    margin-top: 10rpx;
 }
 
 
@@ -176,19 +177,34 @@ view{
 
 .cart-nav{
     position: fixed;
-    top:32rpx;
-    right: 24rpx;
-    background: rgba(255,255,255,.5);
-    font-size: 0;
-    padding: 20rpx;
-    border-radius: 999rpx;
-    box-shadow: 0 1rpx 3rpx rgba(0,0,0,.2);
+    /* top:32rpx; */
+    bottom: 135rpx;
+    right: 60rpx;
+    /* background: rgba(255,255,255,.5); */
+    /* font-size: 0; */
+    /* padding: 20rpx; */
+    border-radius: 100%;
+    /* box-shadow: 0 1rpx 3rpx rgba(0,0,0,.2); */
     z-index: 100;
 }
 
 .cart-nav image{
-    width: 42rpx;
-    height: 42rpx;
+    width: 80rpx;
+    height: 80rpx;
+}
+.cart-nav .budge{
+    position: fixed;
+    bottom: 193rpx;
+    right: 55rpx;
+    border-radius: 100%;
+    z-index: 100;
+    background: #EC5962;
+    width: 35rpx;
+    height: 35rpx;
+    color: #ffffff;
+    font-size: 20rpx;
+    border: 1px solid #ffffff;
+    text-align: center;
 }
 
 .check-list{

wechat/pages/index/index.wxml

@@ -162,7 +162,7 @@
         <!-- 全部分类 开始 -->
         <view wx:elif="{{item.name=='cat'}}">
             <block wx:for="{{cat_list}}" wx:for-index="cat_index" wx:for-item="cat">
-                <view wx:if="{{cat.goods_list.length>0}}" style="background: #fff;margin-bottom: 10rpx; width:100%;overflow-x: hidden;">
+                <view wx:if="{{cat.goods_list.length>0}}" style="background: #fff;margin-bottom: 24rpx; width:100%;overflow-x: hidden;">
                     <view class="title-bar flex-y-center flex-x-center">
                         <view class="title-line"></view>
                         <view class="title flex-y-center">
@@ -170,16 +170,16 @@
                             <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}}">
+                        <!-- <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>
+                        </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">
                             <navigator class="goods-item" url="/pages/goods/goods?id={{goods.id}}">
                                 <image src="{{goods.pic_url}}" mode="aspectFill" />
-                                <text class="text-more-2 {{cat_goods_cols == 3?'fs-sm':''}}" style='padding:0 20rpx;height:2.8em;line-height:1.4;'>{{goods.name}}</text>
+                                <text class="text-more-2 text-more-1 {{cat_goods_cols == 3?'fs-sm':''}}">{{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>

wechat/pages/index/index.wxss

@@ -180,7 +180,7 @@
 
 .title-bar {
     position: relative;
-    border-bottom: 1rpx solid #eee;
+    /* border-bottom: 1rpx solid #eee; */
     height: 100rpx;
 }
 
@@ -253,7 +253,7 @@
 .goods-list .flex-grow-0 {
     width: 33.333333%;
     padding-left: 5rpx;
-    padding-right: 5rpx;
+    padding-right: 10rpx;
 }
 
 .goods-list {
@@ -287,10 +287,11 @@
 }
 
 .goods-list .goods-item .goods-price {
-    color: #ff334b;
+    color: #EB4952;
     text-align: center;
     display: block;
-    padding: 5rpx 5rpx 10rpx 5rpx;
+    /* padding: 5rpx 5rpx 10rpx 5rpx; */
+    padding: 15rpx 10rpx;
 }
 
 .goods-list.goods-list-cols-2 .flex-grow-0 {

wechat/pages/list/list.wxml

@@ -54,15 +54,16 @@
     </view>
     <view class="goods-list">
         <view wx:if="{{show_no_data_tip}}" class="no-data-tip">该类目暂无内容</view>
-        <navigator url="/pages/goods/goods?id={{item.id}}" open-type="navigate" wx:for="{{goods_list}}" class="goods-item" style='font-size:11pt;'>
+        <navigator url="/pages/goods/goods?id={{item.id}}" open-type="navigate" wx:for="{{goods_list}}" class="goods-item  {{ index %2 == 0 ? 'goods-item_odd' : '' }}" style='font-size:11pt;'>
             <image class="goods-pic" src="{{item.pic_url}}" mode="aspectFill" />
             <view class="goods-info" style='padding:5rpx 20rpx;'>
-                <text class="mb-10 text-more-2" style='height:2.8em;line-height:1.4;'>{{item.name}}</text>
-                <view class='flex-row'>
+                <text class="mb-10 text-more-2  text-more-1">{{item.name}}</text>
+                <text class="goods-price">￥{{item.price}}</text>
+                <!-- <view class='flex-row'>
                     <view class='flex-grow-1' style='color:#ff334b'>￥{{item.price}}</view>
-                    <view class='flex-grow-0 fs-sm' style='color:#999;'>已售{{item.sales}}</view>
-                </view>
-            </view>
+                    <view class='flex-grow-0 fs-sm' style='color:#999;'>已售{{item.sales}}</view> 
+                </view> -->
+            </view> 
         </navigator>
     </view>
     <view class="loading-bar {{show_loading_bar?'active':''}}" style="text-align: center">

wechat/pages/list/list.wxss

@@ -79,21 +79,24 @@
 
 
 .top-bar ~ .goods-list{
-    padding-top: 106rpx;
+    padding-top: 75rpx;
 }
 .top-bar.height-bar ~ .goods-list{
     padding-top: 206rpx;
 }
 
 .goods-item{
-    width: 365rpx;
+    width: 369rpx;
     display: inline-block;
     position: relative;
-    margin: 0 5rpx;
-    margin-bottom: 10rpx;
+    /* margin: 0 10rpx;  */
+    margin-bottom: 15rpx; 
     font-size: 0;
     background: #fff;
 }
+.goods-item_odd{
+    margin-right: 15rpx;
+}
 .goods-item .goods-pic{
     width: 100%;
     height: 365rpx;
@@ -113,9 +116,10 @@
 
 .goods-item .goods-price{
     font-size: 11pt;
-    color: #f40;
+    color: #EB4952;
     display: block;
     text-align: center;
+    padding: 15rpx 10rpx;
 }
 
 .loading-bar{
@@ -130,7 +134,7 @@
 }
 
 .sort-item.active{
-    color: #ff4544;
+    color: #EB4952;
 }
 
 .sort-item .sort-icon-box{

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

@@ -1,11 +1,22 @@
 <view class="goods-list">
-    <view class="goods-item" wx:for="{{goods_list}}">
+    <view class="goods-item">
 
         <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>
+                <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>
+                </view>
+                <text style='color: #9D9D9D;' class="flex-y-center">满意</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>
@@ -21,15 +32,15 @@
                     <image src="/images/icon-comment-score-1{{item.score==1?'.active':''}}.png"></image>
                     <text>差评</text>
                 </view>
-            </view>
+            </view>  -->
         </view>
 
         <view class="flex-row content-row">
-            <view class="flex-grow-0 nowrap form-label">评价内容</view>
+            <!-- <view class="flex-grow-0 nowrap form-label">评价内容</view> -->
             <view class="flex-grow-1">
                 <textarea bindinput="contentInput"
                           data-index="{{index}}"
-                          placeholder="请输入评价内容"
+                          placeholder="商品满意吗？来分享你的使用感受吧！"
                           placeholder-style="color:#ccc"
                           maxlength="2000"></textarea>
             </view>
@@ -47,12 +58,11 @@
             <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-picker.png"></image>
+                <image style="width: 160rpx;height: 160rpx" src="/images/icon-image-add.png"></image>
             </view>
         </view>
-
     </view>
 </view>
 <view class="bar-bottom">
-    <view class="submit-btn flex-x-center flex-y-center" bindtap="commentSubmit">提交</view>
+    <view class="submit-btn flex-x-center flex-y-center" bindtap="commentSubmit">确认发布</view>
 </view>

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

@@ -7,7 +7,7 @@
 }
 
 .submit-btn{
-    background: #ff4544;
+    background: #EB4851;
     color: #fff;
     height: 100rpx;
 }

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

@@ -0,0 +1,66 @@
+// pages/order-refund-reason/order-refund-reason.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+  
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+  
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+  
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+  
+  }
+})

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

@@ -0,0 +1,3 @@
+{
+    "navigationBarTitleText": "退款原因"
+}

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

@@ -0,0 +1,69 @@
+<!--pages/order-refund-reason/order-refund-reason.wxml-->
+<form>
+    <radio-group class="radio-group" bindchange="radioChange">
+        <label class="radio">
+            <view class='reason-item'>
+                <view class="flex-grow-1 flex-row">
+                    和预期不符
+                    <view class="flex-grow-1 flex-x-center">
+                        <radio value="{{item.name}}" checked="{{item.checked}}"/>
+                    </view>
+                </view> 
+            </view>
+        </label>
+        <label class="radio">
+            <view class='reason-item'>
+                <view class="flex-grow-1 flex-row">
+                    质量问题
+                    <view class="flex-grow-1 flex-x-center">
+                        <radio value="{{item.name}}" checked="{{item.checked}}"/>
+                    </view>
+                </view> 
+            </view>
+        </label>
+        <label class="radio">
+            <view class='reason-item'>
+                <view class="flex-grow-1 flex-row">
+                    拍错/多拍/效果不好/不喜欢
+                    <view class="flex-grow-1 flex-x-center">
+                        <radio value="{{item.name}}" checked="{{item.checked}}"/>
+                    </view>
+                </view> 
+            </view>
+        </label>
+        <label class="radio">
+            <view class='reason-item'>
+                <view class="flex-grow-1 flex-row">
+                    卖家发错货
+                    <view class="flex-grow-1 flex-x-center">
+                        <radio value="{{item.name}}" checked="{{item.checked}}"/>
+                    </view>
+                </view> 
+            </view>
+        </label>
+        <label class="radio">
+            <view class='reason-item'>
+                <view class="flex-grow-1 flex-row">
+                    收到商品少件/破损/污渍等
+                    <view class="flex-grow-1 flex-x-center">
+                        <radio value="{{item.name}}" checked="{{item.checked}}"/>
+                    </view>
+                </view> 
+            </view>
+        </label>
+        <label class="radio">
+            <view class='reason-item'>
+                <view class="flex-grow-1 flex-row">
+                    其他
+                    <view class="flex-grow-1 flex-x-center">
+                        <radio value="{{item.name}}" checked="{{item.checked}}"/>
+                    </view>
+                </view> 
+            </view>
+        </label>
+    </radio-group>
+</form>
+
+<view class="bar-bottom">
+    <view class="submit-btn flex-x-center flex-y-center" style='justify-content: center;' bindtap="commentSubmit">确定提交</view>
+</view>

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

@@ -0,0 +1,13 @@
+/* pages/order-refund-reason/order-refund-reason.wxss */
+@import "../order-comment/order-comment.wxss";
+page {
+    background: #ffffff;
+}
+.reason-item{
+    padding: 20rpx 0;
+    margin: 0 20rpx;
+    border-bottom: 1px solid #ECECEC;
+}
+.flex-x-center{
+    justify-content: flex-end;
+}

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

@@ -17,36 +17,41 @@
             </view>
         </view>
     </view>
-    <view class="flex-row bg-white switch-tab mb-20">
+    <!-- <view class="flex-row bg-white switch-tab mb-20">
         <view class="flex-grow-1 flex-x-center" bindtap="switchTab" data-id="1">
             <text class="flex-y-center {{switch_tab_1}}">退货退款</text>
         </view>
         <view class="flex-grow-1 flex-x-center" bindtap="switchTab" data-id="2">
             <text class="flex-y-center {{switch_tab_2}}">换货</text>
         </view>
-    </view>
+    </view> -->
     <view class="switch-body {{switch_tab_1}}">
-        <view class="flex-row bg-white form-row mb-20">
-            <view class="flex-grow-0">
-                <text class="form-label">退款原因</text>
-            </view>
-            <view class="flex-grow-1">
-                <textarea style="width: 100%;padding: 0;" rows="2" bindinput="descInput" data-type="1"
-                          placeholder="请输入退款原因"></textarea>
-            </view>
-        </view>
-        <view class="flex-row bg-white form-row mb-20">
-            <view class="flex-grow-0">
-                <text class="form-label">退款金额</text>
+        <view class="bg-white mb-20">
+            <view class='reason-item' style='border-bottom: 1px solid #EEEEEE;'>
+                <view class="flex-grow-1 flex-row">
+                    退款总金额
+                    <view class="flex-grow-1 flex-x-center">
+                        <text class="refund-price">￥{{goods.max_refund_price}}</text>
+                    </view>
+                </view> 
             </view>
-            <view class="flex-grow-1">
-                <text class="refund-price">￥{{goods.max_refund_price}}</text>
+            <view class='reason-item'>
+                <navigator url='/pages/order-refund-reason/order-refund-reason' class="flex-grow-1 flex-row">
+                    退款原因
+                    <view class="flex-grow-1 flex-x-center flex-y-center">
+                        退款原因
+                        <image style='width:12rpx; margin-left: 20rpx;' mode='widthFix' src='/images/icon-jiantou-r.png'></image>
+                    </view>
+                </navigator> 
             </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="mb-20">
+                <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"
@@ -54,16 +59,15 @@
                     </text>
                     <image src="{{item}}" style="width: 160rpx;height: 160rpx" mode="aspectFill"></image>
                 </view>
-                <view wx:if="{{!refund_data_1.pic_list||refund_data_1.pic_list.length<6}}" class="image-picker"
-                      bindtap="chooseImage" data-type="1">
-                    <image style="width: 160rpx;height: 160rpx" src="/images/icon-image-picker.png"></image>
+                <view wx:if="{{!refund_data_1.pic_list||refund_data_1.pic_list.length<6}}" class="image-picker" bindtap="chooseImage" data-type="1">
+                    <image style="width: 160rpx;height: 160rpx" src="/images/icon-image-add.png"></image>
                 </view>
             </view>
         </view>
     </view>
 
 
-    <view class="switch-body {{switch_tab_2}}">
+    <!-- <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>
@@ -90,9 +94,9 @@
                 </view>
             </view>
         </view>
-    </view>
+    </view> -->
 
 
 </view>
-<view class="submit-btn flex-y-center flex-x-center {{switch_tab_1}}" data-type="1" bindtap="refundSubmit">提交</view>
-<view class="submit-btn flex-y-center flex-x-center {{switch_tab_2}}" data-type="2" bindtap="refundSubmit">提交</view>
+<view style='justify-content: center;' class="submit-btn flex-y-center flex-x-center {{switch_tab_1}}" data-type="1" bindtap="refundSubmit">提交</view>
+<!-- <view class="submit-btn flex-y-center flex-x-center {{switch_tab_2}}" data-type="2" bindtap="refundSubmit">提交</view> -->

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

@@ -83,4 +83,12 @@
 
 .submit-btn.active{
     visibility: visible;
+}
+.reason-item{
+    padding: 20rpx 0;
+    margin: 0 20rpx;
+    border-bottom: 1px solid #ECECEC;
+}
+.flex-x-center{
+    justify-content: flex-end;
 }

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

@@ -4,11 +4,11 @@
     <view class="bottom-bar flex-row">
         <view class="flex-y-center flex-grow-1" style="padding: 0 24rpx">
             <view class="flex-grow-1" style="color:#ff4544 ">
-                总计：￥{{new_total_price}}
+                总计： ￥{{new_total_price}}
             </view>
         </view>
         <!-- <view class="flex-y-center flex-grow-0 flex-x-center submit-btn" bindtap="orderSubmit">提交</view> -->
-        <button class="flex-y-center flex-grow-0 flex-x-center submit-btn" form-type='submit'>提交</button>
+        <button class="flex-y-center flex-grow-0 flex-x-center submit-btn" form-type='submit'>去支付</button>
     </view>
 </form>
 

wechat/pages/order-submit/order-submit.wxss

@@ -4,7 +4,7 @@
     position: fixed;
     bottom: 0;
     left: 0;
-    height: 120rpx;
+    height: 110rpx;
     background: #fff;
     border-top: 1rpx solid #e3e3e3;
     width: 100%;
@@ -12,9 +12,9 @@
 }
 
 .bottom-bar .submit-btn {
-    background-color: #ff4544;
+    background-color: #EC554D;
     color: #fff;
-    width: 250rpx;
+    width: 200rpx;
     text-align: center;
     margin: 0;
     padding: 0;

wechat/pages/pay-success/index.js

@@ -0,0 +1,66 @@
+// pages/pay-success/index.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+  
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+  
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+  
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+  
+  }
+})

wechat/pages/pay-success/index.json

@@ -0,0 +1,3 @@
+{
+    "navigationBarTitleText": "支付完成"
+}

wechat/pages/pay-success/index.wxml

@@ -0,0 +1,15 @@
+<!--pages/pay-success/index.wxml-->
+<view class='wrapper'>
+    <icon type='success' size='60'></icon>
+    <view style='color: #333333;'>
+        支付成功
+    </view>
+    <view>
+        <view style='display: inline-block;'>
+            <button class='btn_bg_red' size='mini'>返回首页</button>
+        </view>
+        <view style='display: inline-block;'>
+            <button class='btn_bg_white' size='mini'>查看订单</button>
+        </view>
+    </view>
+</view>

wechat/pages/pay-success/index.wxss

@@ -0,0 +1,12 @@
+/* pages/pay-success/index.wxss */
+.wrapper {
+    background: #ffffff;
+    text-align: center;
+    padding: 40rpx;
+}
+view {
+    padding: 20rpx;
+}
+button[size=mini] {
+    padding: 10rpx 50rpx;
+}

wechat/wxSortPickerView/wxSortPickerView.wxml

@@ -0,0 +1,27 @@
+
+<template name="wxSortPickerView">
+    <scroll-view class="wxSortPickerViewList" scroll-y="true" style="height: {{wxSortPickerData.view.scrollHeight}}px;" bindscrolltoupper="wxSortPickerViewUpper" bindscrolltolower="wxSortPickerViewLower" bindscroll="wxSortPickerViewScroll" scroll-into-view="{{wxSortPickerData.wxSortPickerViewtoView}}" scroll-top="{{wxSortPickerData.wxSortPickerViewScrollTop}}">
+        <block wx:for="{{wxSortPickerData.textData}}" wx:for-item="item" wx:key="">
+            <view id="{{item.tag}}" class="wxSortPickerViewTag">{{item.tag}}</view>
+            <template is="wxSortPickerViewItem" data="{{item}}"/>
+        </block>
+    </scroll-view>
+
+    <template is="wxSortPickerViewTemTags"/>
+</template>
+
+<template name="wxSortPickerViewItem">
+    <block wx:for="{{item.textArray}}" wx:for-item="child" wx:key="">
+        <view class="wxSortPickerViewItem" data-text="{{child}}"  bindtap = "wxSortPickerViewItemTap">
+            <text>{{child}}</text>            
+        </view>
+    </block>
+</template>
+
+<template name="wxSortPickerViewTemTags">
+    <scroll-view style="width:20px;height: {{wxSortPickerData.view.scrollHeight}}px;" class="wxSortPickerViewTemTags">
+        <block wx:for="{{['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '#']}}" wx:for-item="item" wx:key="">
+            <view bindtap="wxSortPickerViewTemTagTap" data-tag="{{item}}" class="wxSortPickerViewTemTag">{{item}}</view>
+        </block>
+    </scroll-view>
+</template>

wechat/wxSortPickerView/wxSortPickerView.wxss

@@ -0,0 +1,33 @@
+.wxSortPickerViewTemTags{
+  position: fixed;
+  top: 10px;
+  right: 0;
+  /* background-color: #fff; */
+  color: #9D9D9E;
+}
+.wxSortPickerViewTemTag{
+  text-align: center;
+  padding: 3px;
+  font-size: 12px;
+}
+.wxSortPickerViewFixedTag{
+  position: fixed;
+  width: 100%;
+}
+
+.wxSortPickerViewTag{
+  background-color: #eee;
+  font-size: 16px;
+  /* font-weight: bold; */
+  color: #000;
+  height: 30px;
+  line-height: 30px;
+  padding: 0 8px;
+}
+
+.wxSortPickerViewItem{
+  height: 50px;
+  line-height: 50px;
+  border-bottom: 1px solid #eee;
+  margin-left: 10px;
+}