add

wechat/app.js

@@ -18,11 +18,11 @@ App({
         api = this.api;
 
         this.getNavigationBarColor();
-        this.getStoreData();
+        // this.getStoreData();
         this.getCatList();
     },
 
-    getStoreData: function () {
+    getStoreData: function (that) {
         var page = this;
         this.request({
             url: api.default.store,
@@ -36,7 +36,7 @@ App({
                 }
             },
             complete: function () {
-                page.login();
+                page.login(that);
             }
         });
     },
@@ -53,84 +53,105 @@ App({
         });
     },
 
-    login: function () {
+    login: function (that) {
         var pages = getCurrentPages();
         var page = pages[(pages.length - 1)];
-        wx.showLoading({
-            title: "正在登录",
-            mask: true,
-        });
+        // wx.showLoading({
+        //     title: "正在登录",
+        //     mask: true,
+        // });
         wx.login({
             success: function (res) {
                 if (res.code) {
                     var code = res.code;
-                    wx.getUserInfo({
-                        success: function (res) {
-                            getApp().request({
-                                url: api.passport.login,
-                                method: "post",
-                                data: {
-                                    code: code,
-                                    user_info: res.rawData,
-                                    encrypted_data: res.encryptedData,
-                                    iv: res.iv,
-                                    signature: res.signature
-                                },
-                                success: function (res) {
-                                    wx.hideLoading();
-                                    if (res.code == 0) {
-                                        wx.setStorageSync("access_token", res.data.access_token);
-                                        wx.setStorageSync("user_info", res.data);
-                                        var p = getCurrentPages();
-                                        var parent_id = 0;
-                                        if (p[0].options.user_id != undefined) {
-                                            var parent_id = p[0].options.user_id;
-                                        }
-                                        else if (p[0].options.scene != undefined) {
-                                            var parent_id = p[0].options.scene;
-                                        }
-                                        getApp().bindParent({
-                                            parent_id: parent_id || 0
-                                        });
+                    wx.getSetting({
+                        success: res => {
+                            if (res.authSetting['scope.userInfo']) {
+                                console.log('已经授权')
+                                // 已经授权，可以直接调用 getUserInfo 
+                                // 获取用户信息
+                                wx.getSetting({
+                                    success: res => {
+                                        if (res.authSetting['scope.userInfo']) {
+                                            // 已经授权，可以直接调用 getUserInfo 获取头像昵称，不会弹框
+                                            wx.getUserInfo({
+                                                success: function (res) {
+                                                    getApp().request({
+                                                        url: api.passport.login,
+                                                        method: "post",
+                                                        data: {
+                                                            code: code,
+                                                            user_info: res.rawData,
+                                                            encrypted_data: res.encryptedData,
+                                                            iv: res.iv,
+                                                            signature: res.signature
+                                                        },
+                                                        success: function (res) {
+                                                            wx.hideLoading();
+                                                            if (res.code == 0) {
+                                                                wx.setStorageSync("access_token", res.data.access_token);
+                                                                wx.setStorageSync("user_info", res.data);
+                                                                var p = getCurrentPages();
+                                                                var parent_id = 0;
+                                                                if (p[0].options.user_id != undefined) {
+                                                                    var parent_id = p[0].options.user_id;
+                                                                }
+                                                                else if (p[0].options.scene != undefined) {
+                                                                    var parent_id = p[0].options.scene;
+                                                                }
+                                                                getApp().bindParent({
+                                                                    parent_id: parent_id || 0
+                                                                });
 
-                                        if (page == undefined) {
-                                            return;
+                                                                if (page == undefined) {
+                                                                    return;
 
+                                                                }
+                                                                var loginNoRefreshPage = getApp().loginNoRefreshPage;
+                                                                for (var i in loginNoRefreshPage) {
+                                                                    if (loginNoRefreshPage[i] === page.route)
+                                                                        return;
+                                                                }
+                                                                wx.redirectTo({
+                                                                    url: "/" + page.route + "?" + util.objectToUrlParams(page.options),
+                                                                    fail: function () {
+                                                                        wx.switchTab({
+                                                                            url: "/" + page.route,
+                                                                        });
+                                                                    },
+                                                                });
+                                                            } else {
+                                                                wx.showToast({
+                                                                    title: res.msg
+                                                                });
+                                                            }
+                                                        }
+                                                    });
+                                                },
+                                                fail: function (res) {
+                                                    wx.hideLoading();
+                                                    getApp().getauth({
+                                                        content: '需要获取您的用户信息授权，请到小程序设置中打开授权',
+                                                        cancel: true,
+                                                        success: function (e) {
+                                                            if (e) {
+                                                                getApp().login();
+                                                            }
+                                                        },
+                                                    });
+                                                }
+                                            });
                                         }
-                                        var loginNoRefreshPage = getApp().loginNoRefreshPage;
-                                        for (var i in loginNoRefreshPage) {
-                                            if (loginNoRefreshPage[i] === page.route)
-                                                return;
-                                        }
-                                        wx.redirectTo({
-                                            url: "/" + page.route + "?" + util.objectToUrlParams(page.options),
-                                            fail: function () {
-                                                wx.switchTab({
-                                                    url: "/" + page.route,
-                                                });
-                                            },
-                                        });
-                                    } else {
-                                        wx.showToast({
-                                            title: res.msg
-                                        });
                                     }
-                                }
-                            });
-                        },
-                        fail: function (res) {
-                            wx.hideLoading();
-                            getApp().getauth({
-                                content: '需要获取您的用户信息授权，请到小程序设置中打开授权',
-                                cancel: true,
-                                success: function (e) {
-                                    if (e) {
-                                        getApp().login();
-                                    }
-                                },
-                            });
+                                })
+                            } else {
+                                page.setData({
+                                    showModal: true
+                                })
+                            }
                         }
-                    });
+                    })
+                    
                 } else {
                     //console.log(res);
                 }

wechat/app.json

@@ -2,6 +2,7 @@
   "pages": [
     "pages/index/index",
     "pages/favorite/favorite",
+    "pages/goods/goods",
     "pages/pay-success/index",
     "pages/order/order",
     "pages/order-refund-detail/order-refund-detail",
@@ -18,7 +19,6 @@
     "pages/express-detail/express-detail",
     "pages/order-detail/order-detail",
     "pages/address-picker/address-picker",
-    "pages/goods/goods",
     "pages/list/list",
     "pages/search/search",
     "pages/order-submit/order-submit",

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

@@ -18,6 +18,20 @@ Page({
 
     submit: function(){
         var that = this;
+        if (that.data.express_name == undefined) {
+            wx.showToast({
+                title: '快递公司必填',
+                icon: 'none'
+            })
+            return;
+        }
+        if (that.data.express_num == undefined) {
+            wx.showToast({
+                title: '运单号必填',
+                icon: 'none'
+            })
+            return;
+        }
         app.request({
             url: api.order.express_num,
             data:{

wechat/pages/favorite/favorite.js

@@ -47,6 +47,9 @@ Page({
                                     reload: true,
                                     page: 1,
                                 });
+                                page.setData({
+                                    num: 0
+                                })
                             }
                         }
                     });

wechat/pages/favorite/favorite.wxml

@@ -1,6 +1,6 @@
 <!--pages/favorite/favorite.wxml-->
 <view>
-    <scroll-view wx:for="{{goods.list}}" scroll-x="true" style=" white-space: nowrap;" >
+    <scroll-view scroll-left='{{num}}' wx:for="{{goods.list}}" scroll-x="true" style=" white-space: nowrap; height:　180rpx; position: relative;" >
         <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;'>
@@ -17,12 +17,7 @@
                                 </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 class="flex-grow-1 goods-price">￥{{item.price}}</view>
                                 </view>
                             </view>
                         </view>
@@ -31,11 +26,7 @@
             </view>
         </view>
         <view bindtap='favoriteRemove' data-id='{{item.goods_id}}' class='delete'>
-            <view class="flex-row">
-                <view class="flex-col">
-                    <image src="/images/icon-delete.png" mode="widthFix" style='width: 80rpx;'></image>  
-                </view>
-            </view> 
+            <view>删除</view>
         </view>
     </scroll-view>
     

wechat/pages/favorite/favorite.wxss

@@ -1,5 +1,5 @@
 /* pages/favorite/favorite.wxss */
-@import '../cart/cart.wxss';
+/* @import '../cart/cart.wxss'; */
 page{
     background: #fff;
 }
@@ -42,10 +42,13 @@ page{
     margin: 15rpx 0 35rpx;
 }
 .delete{
-    /* background: #EB4851;    */
-    /* border: 1px solid red;  */
-    width: 100rpx; 
+    background: #EB4851;   
+    height: 229rpx;  
+    width: 120rpx;
+    line-height: 229rpx;
+    position: absolute;
     display: inline-block;
+    color: #ffffff;
     text-align: center;
 }
 .loading-bar{

wechat/pages/goods/goods.js

@@ -76,11 +76,33 @@ Page({
         app.loginBindParent({parent_id: parent_id});
         var page = this;
         page.setData({
-            id: options.id,
+            id: options.id
         });
         page.getGoods();
         page.getCommentList();
     },
+    call: function(){
+        var that = this;
+        wx.makePhoneCall({
+            phoneNumber: that.data.goods.contact_tel 
+        })
+    },
+    changeState: function(e){
+        var that = this;
+        var state = e.currentTarget.dataset.state;
+        var type = e.currentTarget.dataset.type;
+        var index = e.currentTarget.dataset.index;
+        var comment_list = that.data.comment_list;
+        if(type == 'content'){
+            comment_list[index].up_down = state;
+        }
+        else{
+            comment_list[index].reply_up_down = state;
+        }
+        that.setData({
+            comment_list: comment_list
+        })
+    },
     change: function(e){
         var type = e.currentTarget.dataset.type;
         this.setData({

wechat/pages/goods/goods.wxml

@@ -211,22 +211,17 @@
                                     <view class="flex-grow-1 flex-y-center nickname">{{item.nickname}}</view>
                                     <view class="flex-grow-0 flex-y-center addtime">{{item.addtime}}</view>
                                 </view>
-                                <!--
-                                <view class="mb-20" wx:if="{{item.score==3}}">
-                                    <text class="score-tag">好评</text>
-                                </view>
-                                <view class="mb-20" wx:if="{{item.score==2}}">
-                                    <text class="score-tag">中评</text>
-                                </view>
-                                <view class="mb-20" wx:if="{{item.score==1}}">
-                                    <text class="score-tag">差评</text>
-                                </view>
-                                -->
-                                <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]!=''}}">
+                                <view class="mb-20 content">{{item.up_down == 1 ? item.content_min : item.content}}</view>
+                                <view bindtap='changeState' data-state='{{item.up_down == 1 ? 0 : 1}}' data-type='content' data-index='{{index}}' wx:if='{{item.up_down_state == 1}}' style='float: right; color: #EC5962; font-size:25rpx;'>{{item.up_down == 1 ? '查看更多' : '收起评价'}}</view>
+                                <view class="pic-list" wx:if="{{item.pic_list&&item.pic_list.length>0&&item.pic_list[0]!=''}}" style='clear: both;'>
                                     <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 wx:if="{{item.reply_content}}" class="reply content">
+                                    <view>
+                                        商家: <view class="reply-content">{{item.reply_up_down == 1 ? item.reply_content_min : item.reply_content}}</view>
+                                    </view>
+                                    <view bindtap='changeState' data-state='{{item.reply_up_down == 1 ? 0 : 1}}' data-type='reply_content' data-index='{{index}}' wx:if='{{item.reply_up_down_state == 1}}' style='float: right; color: #EC5962; font-size:25rpx;'>{{item.reply_up_down == 1 ? '查看更多' : '收起评价'}}</view>
+                                </view>
                             </view>
                         </view>
                     </view>
@@ -247,7 +242,7 @@
                     <text>客服</text>
                 </view>
             </button>
-            <button class="flex-grow-0 flex-y-center bar-bottom-btn" open-type="contact">
+            <button class="flex-grow-0 flex-y-center bar-bottom-btn" bindtap='call'>
                 <view>
                     <image src="/images/icon-service-good.png"></image>
                     <text>客服</text>

wechat/pages/goods/goods.wxss

@@ -300,7 +300,7 @@ view{
     border-radius:16rpx;
     background:#f7f7f7;
     font-size:11pt;
-    padding:22rpx 30rpx;
+    padding: 30rpx;
     color:#ff4544;
 }
 .reply-content{

wechat/pages/index/index.js

@@ -25,7 +25,7 @@ Page({
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
-
+        app.getStoreData(this);
         app.pageOnLoad(this);
         this.loadData(options);
         var page = this;
@@ -48,6 +48,15 @@ Page({
             })
         }
     },
+    updownComment: function(){
+
+    },
+    userInfoHandler: function (e) {
+        this.setData({
+            showModal: false
+        })
+        app.login(this);
+    },
 
     /**
      * 购买记录

wechat/pages/index/index.wxml

@@ -1,4 +1,14 @@
 <include src="/commons/navbar/navbar" />
+<view wx:if="{{showModal}}" class='getuserinfo'>
+    <view class='wrapper'>
+        <view>微信授权</view>
+        <view class='content'>
+            · 获得你的公开信息（昵称、头像等）
+        </view>
+        <!-- <button class='btn-agree btn-refuse' bindtap='refuseGetInfo'>拒绝</button> -->
+        <button class='btn-agree' open-type='getUserInfo' bindgetuserinfo='userInfoHandler'>允许</button>
+    </view>
+</view>
 <view class="after-navber">
     <view class="purchase1" wx:if="{{buy_user}}">
         <image class="purchase2" src="{{buy_avatar_url}}"></image>

wechat/pages/index/index.wxss

@@ -1,3 +1,39 @@
+.getuserinfo{
+    position: fixed;
+    z-index: 9999;
+    background: rgba(0, 0, 0, 0.7);
+    width: 100%;
+    height: 100%;
+}
+.getuserinfo .wrapper{
+    position: relative;
+    background: #FFFFFE;
+    border-radius: 5rpx;
+    padding: 50rpx;
+    width: 80%;
+    height: 370rpx;
+    transform: translate(12%,80%);
+}
+.getuserinfo .content{
+    font-size: 30rpx;
+    color: #AAAAAA;
+    padding: 20rpx 0;
+    margin: 20rpx 0 0 0;
+    border-top: 1px solid #EAEAEA;
+}
+.getuserinfo .btn-agree{
+    position: fixed;
+    bottom: 50rpx;
+    right: 50rpx;
+    width: 150rpx;
+    font-size: 30rpx;
+    background: none;
+    color: #55BF48;
+}
+.getuserinfo .btn-refuse{
+    right: 200rpx;
+    color: #AAAAAA;
+}
 .banner {
     height: 360rpx;
 }

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

@@ -161,8 +161,6 @@ Page({
         }
 
         function submit() {
-            goods_list;
-            debugger;
             app.request({
                 url: api.order.comment,
                 method: "post",

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

@@ -86,11 +86,11 @@
             <view class="flex-grow-1">运费</view>
             <view class="flex-grow-0">￥{{order.express_price}}</view>
         </view>
-        <view wx:if='{{order.content}}'>
+        <view class="flex-row block-row" 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-row block-row" wx:if='{{order.words}}'>
             <view class="flex-grow-1">商家留言</view>
             <view class="flex-grow-0">{{order.words}}</view>
         </view>

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>
@@ -93,9 +93,10 @@
                         </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>
+                        <text wx:if="{{order.refund_state==1}}">退款申请中</text>
+                        <!-- <button wx:else class="order-option-btn" bindtap="orderRevoke" data-id="{{order.order_id}}">申请退款
+                        </button> -->
+                        <navigator url='/pages/order-detail/order-detail?id={{order.order_id}}' wx:else class="order-option-btn">申请退款</navigator>
                     </view>
                     <view class="flex-grow-1" wx:if="{{order.is_pay==0}}">
                         <button class="order-option-btn order-red-btn" bindtap="orderPay" data-id="{{order.order_id}}">付款</button>