From 0088f922f54c3c8144ebbb67ab1c2fb8d077781d Mon Sep 17 00:00:00 2001
From: shengliang <sligxl@163.com>
Date: Fri, 29 Nov 2019 20:06:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=94=AF=E4=BB=98=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E6=97=B6=E7=9A=84=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=96=B0logo=E3=80=81=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                               |   1 +
 images/icon/pay-error.png              | Bin 5960 -> 0 bytes
 images/icon/pay-success.png            | Bin 6451 -> 0 bytes
 pages/app-auth/index.wxml              |   2 +-
 pages/cart/cart.js                     |  24 +++++++++++--------
 pages/category/index.wxml              |   2 +-
 pages/category/index.wxss              |   1 +
 pages/goods/goods.js                   |  31 ++++++++-----------------
 pages/index/index.js                   |   2 +-
 pages/index/index.json                 |   2 +-
 pages/index/index.wxml                 |   2 +-
 pages/index/index.wxss                 |   4 ++--
 pages/order-check/index.js             |  11 +++++----
 pages/payResult/payResult.js           |   2 +-
 pages/ucenter/index/index.wxml         |   2 +-
 pages/ucenter/order-details/index.js   |  14 +----------
 pages/ucenter/order-details/index.wxml |   2 +-
 pages/ucenter/order-list/index.js      |  30 +++---------------------
 services/pay.js                        |   1 +
 19 files changed, 48 insertions(+), 85 deletions(-)
 delete mode 100644 images/icon/pay-error.png
 delete mode 100644 images/icon/pay-success.png

diff --git a/app.json b/app.json
index 13c4af7..e50bf7d 100644
--- a/app.json
+++ b/app.json
@@ -12,6 +12,7 @@
         "pages/ucenter/index/index",
         "pages/ucenter/settings/index",
         "pages/ucenter/order-list/index",
+        "pages/ucenter/goods-list/index",
         "pages/ucenter/order-details/index",
         "pages/ucenter/express-info/index",
         "pages/ucenter/footprint/index",
diff --git a/images/icon/pay-error.png b/images/icon/pay-error.png
deleted file mode 100644
index 9afd986f5dcc81968d82987f941fe2b351f07c4b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5960
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

diff --git a/images/icon/pay-success.png b/images/icon/pay-success.png
deleted file mode 100644
index 0eebfecc56577019556dec427426e7865266718f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6451
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
N002ovPDHLkV1lLYJ*ofz

diff --git a/pages/app-auth/index.wxml b/pages/app-auth/index.wxml
index 39c4af2..30b6c79 100644
--- a/pages/app-auth/index.wxml
+++ b/pages/app-auth/index.wxml
@@ -2,7 +2,7 @@
     <view class='logo'>
         <image class='logo-img' src='http://lucky-icon.meiweiyuxian.com/hio/logo.png'></image>
     </view>
-    <view class='logo-name'>海鸥商城</view>
+    <view class='logo-name'>海风小店</view>
     <view class='intro'>开源微信小程序商城</view>
     <view class='login'>请完成微信授权以继续使用</view>
     <button class='btn-login' open-type="getUserInfo" bindgetuserinfo='getUserInfo'>
diff --git a/pages/cart/cart.js b/pages/cart/cart.js
index 0c565fb..360567a 100644
--- a/pages/cart/cart.js
+++ b/pages/cart/cart.js
@@ -72,6 +72,9 @@ Page({
                     cartTotal: res.data.cartTotal,
                     hasCartGoods: hasCartGoods
                 });
+                if (res.data.cartTotal.numberChange == 1) {
+                    util.showErrorToast('部分商品库存有变动');
+                }
             }
             that.setData({
                 checkedAllStatus: that.isCheckedAll()
@@ -140,11 +143,10 @@ Page({
         }
 
     },
-    updateCart: function(productId, goodsId, number, id) {
+    updateCart: function (itemIndex,productId, number, id) {
         let that = this;
         util.request(api.CartUpdate, {
             productId: productId,
-            goodsId: goodsId,
             number: number,
             id: id
         }, 'POST').then(function(res) {
@@ -153,9 +155,13 @@ Page({
                     cartGoods: res.data.cartList,
                     cartTotal: res.data.cartTotal
                 });
+                let cartItem = that.data.cartGoods[itemIndex];
+                cartItem.number = number;
                 that.getCartNum();
             }
-
+            else{
+                util.showErrorToast('库存不足了')
+            }
             that.setData({
                 checkedAllStatus: that.isCheckedAll()
             });
@@ -163,32 +169,30 @@ Page({
 
     },
     cutNumber: function(event) {
-
         let itemIndex = event.target.dataset.itemIndex;
         let cartItem = this.data.cartGoods[itemIndex];
         if (cartItem.number - 1 == 0) {
-            util.showErrorToast('再减没啦，要删除左滑试试')
+            util.showErrorToast('删除左滑试试')
         }
         let number = (cartItem.number - 1 > 1) ? cartItem.number - 1 : 1;
 
-        cartItem.number = number;
+        // cartItem.number = number;
         this.setData({
             cartGoods: this.data.cartGoods,
         });
-        this.updateCart(cartItem.product_id, cartItem.goods_id, number, cartItem.id);
+        this.updateCart(itemIndex,cartItem.product_id, number, cartItem.id);
     },
     clicknone: function() {
-
     },
     addNumber: function(event) {
         let itemIndex = event.target.dataset.itemIndex;
         let cartItem = this.data.cartGoods[itemIndex];
         let number = Number(cartItem.number) + 1;
-        cartItem.number = number;
+        // cartItem.number = number;
         this.setData({
             cartGoods: this.data.cartGoods,
         });
-        this.updateCart(cartItem.product_id, cartItem.goods_id, number, cartItem.id);
+        this.updateCart(itemIndex,cartItem.product_id, number, cartItem.id);
     },
     getCartNum: function() {
         util.request(api.CartGoodsCount).then(function(res) {
diff --git a/pages/category/index.wxml b/pages/category/index.wxml
index a784c2d..a16cf29 100755
--- a/pages/category/index.wxml
+++ b/pages/category/index.wxml
@@ -49,7 +49,7 @@
             </block>
             <block wx:else>
                 <view class="loading-wrap">
-                    <image class="img" src="http://lucky-icon.meiweiyuxian.com/hio/loading.gif"></image>
+                    <image class="img" src="http://lucky-icon.meiweiyuxian.com/hio/loading2.gif"></image>
                     <view class="text">正在加载...</view>
                 </view>
             </block>
diff --git a/pages/category/index.wxss b/pages/category/index.wxss
index 604e18f..e29cc2b 100755
--- a/pages/category/index.wxss
+++ b/pages/category/index.wxss
@@ -117,6 +117,7 @@ page {
 }
 .catalog .cate .loading-wrap .text{
     font-size: 26rpx;
+    color: #999;
 }
 
 .catalog .cate .banner-container {
diff --git a/pages/goods/goods.js b/pages/goods/goods.js
index adfc45e..d018c85 100644
--- a/pages/goods/goods.js
+++ b/pages/goods/goods.js
@@ -225,9 +225,8 @@ Page({
                 });
                 // console.error('规格所对应货品不存在');
                 wx.showToast({
-                    image: 'http://lucky-icon.meiweiyuxian.com/hio/icon_error.png',
+                    image: '/images/icon/icon_error.png',
                     title: '规格所对应货品不存在',
-                    mask: true
                 });
                 return;
             }
@@ -241,9 +240,8 @@ Page({
                     soldout: true
                 });
                 wx.showToast({
-                    image: 'http://lucky-icon.meiweiyuxian.com/hio/icon_error.png',
+                    image: '/images/icon/icon_error.png',
                     title: '库存不足',
-                    // mask: true
                 });
                 return false;
             }
@@ -368,9 +366,8 @@ Page({
             //提示选择完整规格
             if (!this.isCheckedAllSpec()) {
                 wx.showToast({
-                    image: 'http://lucky-icon.meiweiyuxian.com/hio/icon_error.png',
+                    image: '/images/icon/icon_error.png',
                     title: '请选择规格',
-                    mask: true
                 });
                 return false;
             }
@@ -380,9 +377,8 @@ Page({
             if (!checkedProductArray || checkedProductArray.length <= 0) {
                 //找不到对应的product信息，提示没有库存
                 wx.showToast({
-                    image: 'http://lucky-icon.meiweiyuxian.com/hio/icon_error.png',
+                    image: '/images/icon/icon_error.png',
                     title: '库存不足',
-                    mask: true
                 });
                 return false;
             }
@@ -391,9 +387,8 @@ Page({
             if (checkedProduct.goods_number < this.data.number) {
                 //要买的数量比库存多
                 wx.showToast({
-                    image: 'http://lucky-icon.meiweiyuxian.com/hio/icon_error.png',
+                    image: '/images/icon/icon_error.png',
                     title: '库存不足',
-                    mask: true
                 });
                 return false;
             }
@@ -414,7 +409,6 @@ Page({
                         } else {
                             wx.showToast({
                                 title: '添加成功',
-                                // mask: true
                             });
                             if (productLength != 1 || that.data.openAttr == true) {
                                 that.setData({
@@ -430,9 +424,8 @@ Page({
                         }
                     } else {
                         wx.showToast({
-                            image: 'http://lucky-icon.meiweiyuxian.com/hio/icon_error.png',
+                            image: '/images/icon/icon_error.png',
                             title: _res.errmsg,
-                            mask: true
                         });
                     }
 
@@ -459,9 +452,8 @@ Page({
             //提示选择完整规格
             if (!this.isCheckedAllSpec()) {
                 wx.showToast({
-                    image: 'http://lucky-icon.meiweiyuxian.com/hio/icon_error.png',
+                    image: '/images/icon/icon_error.png',
                     title: '请选择规格',
-                    mask: true
                 });
                 return false;
             }
@@ -470,9 +462,8 @@ Page({
             if (!checkedProductArray || checkedProductArray.length <= 0) {
                 //找不到对应的product信息，提示没有库存
                 wx.showToast({
-                    image: 'http://lucky-icon.meiweiyuxian.com/hio/icon_error.png',
+                    image: '/images/icon/icon_error.png',
                     title: '库存不足',
-                    mask: true
                 });
                 return false;
             }
@@ -481,9 +472,8 @@ Page({
             if (checkedProduct.goods_number < this.data.number) {
                 //要买的数量比库存多
                 wx.showToast({
-                    image: 'http://lucky-icon.meiweiyuxian.com/hio/icon_error.png',
+                    image: '/images/icon/icon_error.png',
                     title: '库存不足',
-                    mask: true
                 });
                 return false;
             }
@@ -504,9 +494,8 @@ Page({
                         });
                     } else {
                         wx.showToast({
-                            image: 'http://lucky-icon.meiweiyuxian.com/hio/icon_error.png',
+                            image: '/images/icon/icon_error.png',
                             title: _res.errmsg,
-                            mask: true
                         });
                     }
                 });
diff --git a/pages/index/index.js b/pages/index/index.js
index 32d6c56..25af9a8 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -46,7 +46,7 @@ Page({
     onShareAppMessage: function() {
         let info = wx.getStorageSync('userInfo');
         return {
-            title: '海鸥商城',
+            title: '海风小店',
             desc: '开源微信小程序商城',
             path: '/pages/index/index?id=' + info.id
         }
diff --git a/pages/index/index.json b/pages/index/index.json
index cf016bf..1235fe7 100644
--- a/pages/index/index.json
+++ b/pages/index/index.json
@@ -1,3 +1,3 @@
 {
-  "navigationBarTitleText": "海鸥商城"
+  "navigationBarTitleText": "海风小店"
 }
\ No newline at end of file
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 89c0ede..ce6f523 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -98,6 +98,6 @@
     <view class="no-more-goods ">没有更多商品啦</view>
 </view>
 <view class="loading" style="height:{{sysHeight}}px" wx:else>
-    <image class="img" src="http://lucky-icon.meiweiyuxian.com/hio/loading.gif"></image>
+    <image class="img" src="http://lucky-icon.meiweiyuxian.com/hio/loading2.gif"></image>
     <view class="text">努力加载中</view>
 </view>
\ No newline at end of file
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index f6b22cd..011970f 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -18,8 +18,8 @@
 }
 
 .loading .img {
-    width: 60rpx;
-    height: 60rpx;
+    width: 90rpx;
+    height: 90rpx;
 }
 
 .loading .text {
diff --git a/pages/order-check/index.js b/pages/order-check/index.js
index 8c48ce1..27b2f2c 100755
--- a/pages/order-check/index.js
+++ b/pages/order-check/index.js
@@ -14,11 +14,11 @@ Page({
         addressId: 0,
         goodsCount: 0,
         postscript: '',
+        outStock: 0
     },
     toGoodsList: function (e) {
-        let orderId = this.data.orderId;
         wx.navigateTo({
-            url: '/pages/ucenter/goods-list/index?type=1',
+            url: '/pages/ucenter/goods-list/index?id=0',
         });
     },
     toSelectAddress: function () {
@@ -119,6 +119,9 @@ Page({
                 if (res.data.outStock == 1) {
                     util.showErrorToast('有部分商品缺货或已下架');
                 }
+                else if (res.data.numberChange == 1){
+                    util.showErrorToast('部分商品库存有变动');
+                }
             }
         });
     },
@@ -141,7 +144,7 @@ Page({
             formId: formId,
             actualPrice: actualPrice,
         }, 'POST').then(res => {
-            const orderId = res.data.orderInfo.id;
+            console.log(res);
             if (res.errno === 0) {
                 wx.removeStorageSync('orderId');
                 wx.setStorageSync('addressId', 0);
@@ -156,7 +159,7 @@ Page({
                     });
                 });
             } else {
-                util.showErrorToast('下单失败');
+                util.showErrorToast(res.errmsg);
             }
         });
     }
diff --git a/pages/payResult/payResult.js b/pages/payResult/payResult.js
index e442ff0..700fa64 100755
--- a/pages/payResult/payResult.js
+++ b/pages/payResult/payResult.js
@@ -34,7 +34,7 @@ Page({
                 status: true
             });
         }).catch(res => {
-            util.showErrorToast('支付失败');
+            util.showErrorToast(res.errmsg);
         });
     }
 })
\ No newline at end of file
diff --git a/pages/ucenter/index/index.wxml b/pages/ucenter/index/index.wxml
index aee7dde..34a151b 100644
--- a/pages/ucenter/index/index.wxml
+++ b/pages/ucenter/index/index.wxml
@@ -94,7 +94,7 @@
     </view>
     <view class="company">
         <view class="c-wrap">
-            <view class="text">海鸥商城</view>
+            <view class="text">海风小店</view>
             <view class="line"></view>
         </view>
         <view class="tip">开源微信小程序商城</view>
diff --git a/pages/ucenter/order-details/index.js b/pages/ucenter/order-details/index.js
index e01bf06..6efefce 100644
--- a/pages/ucenter/order-details/index.js
+++ b/pages/ucenter/order-details/index.js
@@ -60,12 +60,9 @@ Page({
     payOrder: function(e) {
         let that = this;
         pay.payOrder(parseInt(that.data.orderId)).then(res => {
-            // this.setData({
-            //     status: true
-            // });
             that.getOrderDetail();
         }).catch(res => {
-            util.showErrorToast('支付失败');
+            util.showErrorToast(res.errmsg);
         });
     },
     toSelectAddress: function() {
@@ -155,15 +152,6 @@ Page({
                     onPosting: 1,
                     express: express
                 });
-                // var traces = res.data.traces;
-                // that.setData({
-                //     expressList: expressList
-                // });
-                // if (traces.length == 0) {
-                //     that.setData({
-                //         hasExpress: 0
-                //     });
-                // }
             }
         });
     },
diff --git a/pages/ucenter/order-details/index.wxml b/pages/ucenter/order-details/index.wxml
index 772b187..dd19802 100644
--- a/pages/ucenter/order-details/index.wxml
+++ b/pages/ucenter/order-details/index.wxml
@@ -37,7 +37,7 @@
         </view>
     </view>
     <view class="onPosting" wx:if="{{orderInfo.shipping_status && onPosting == 0}}">
-        <image class='loading' src='http://lucky-icon.meiweiyuxian.com/hio/loading.gif'></image>
+        <image class='loading' src='http://lucky-icon.meiweiyuxian.com/hio/loading2.gif'></image>
         <view class='t'>快递信息查询中。。。</view>
     </view>
     <view wx:elif="{{orderInfo.shipping_status && onPosting == 1}}" class="express">
diff --git a/pages/ucenter/order-list/index.js b/pages/ucenter/order-list/index.js
index 4a52944..6c5ecbf 100644
--- a/pages/ucenter/order-list/index.js
+++ b/pages/ucenter/order-list/index.js
@@ -38,7 +38,8 @@ Page({
             that.getOrderList();
             that.getOrderInfo();
         }).catch(res => {
-            util.showErrorToast('支付失败');
+            console.log(res);
+            util.showErrorToast(res.errmsg);
         });
     },
     getOrderInfo: function(e) {
@@ -61,16 +62,6 @@ Page({
         }).then(function(res) {
             if (res.errno === 0) {
                 let count = res.data.count;
-                // var orderList = res.data.data;
-                // that.setData({
-                //     orderList: orderList
-                // });
-                // if (orderList.length == 0) {
-                //     that.setData({
-                //         hasOrder: 1
-                //     });
-                // }
-
                 that.setData({
                     allCount: count,
                     allOrderList: that.data.allOrderList.concat(res.data.data),
@@ -78,14 +69,11 @@ Page({
                     orderList: that.data.allOrderList.concat(res.data.data)
                 });
                 let hasOrderData = that.data.allOrderList.concat(res.data.data);
-
                 if (count == 0) {
                     that.setData({
                         hasOrder: 1
                     });
                 }
-
-
             }
         });
     },
@@ -94,9 +82,7 @@ Page({
             url: '/pages/index/index'
         });
     },
-    onLoad: function() {
-
-    },
+    onLoad: function() {},
     onShow: function() {
         let showType = wx.getStorageSync('showType');
         let nowShowType = this.data.showType;
@@ -113,13 +99,6 @@ Page({
         }
         this.getOrderInfo();
     },
-    // onPullDownRefresh: function () {
-    //     wx.showNavigationBarLoading()
-    //     this.getOrderList();
-    //     this.getOrderInfo();
-    //     wx.hideNavigationBarLoading() //完成停止加载
-    //     wx.stopPullDownRefresh() //停止下拉刷新
-    // },
     switchTab: function(event) {
         let showType = event.currentTarget.dataset.index;
         wx.setStorageSync('showType', showType);
@@ -166,10 +145,8 @@ Page({
             }
         });
     },
-
     onReachBottom: function() {
         let that = this;
-
         if (that.data.allCount / that.data.size < that.data.allPage) {
             that.setData({
                 showTips: 1
@@ -181,5 +158,4 @@ Page({
         });
         that.getOrderList();
     }
-
 })
\ No newline at end of file
diff --git a/services/pay.js b/services/pay.js
index f384478..a914b9d 100644
--- a/services/pay.js
+++ b/services/pay.js
@@ -10,6 +10,7 @@ function payOrder(orderId) {
         }).then((res) => {
             if (res.errno === 0) {
                 const payParam = res.data;
+                console.log(res.data);
                 wx.requestPayment({
                     'timeStamp': payParam.timeStamp,
                     'nonceStr': payParam.nonceStr,