From 353cad572e8ccc65f3c367d06be8b1d50ff01983 Mon Sep 17 00:00:00 2001
From: iamdarcy <snoe.oo@gmail.com>
Date: Sun, 4 Jul 2021 13:51:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=8E=B7=E5=8F=96=E5=A4=B4=E5=83=8F?=
 =?UTF-8?q?=E5=92=8C=E6=98=B5=E7=A7=B0=E7=9A=84=E6=8E=A5=E5=8F=A3=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86ios=E4=BB=98=E6=AC=BE=E5=90=8E?=
 =?UTF-8?q?=E8=AE=A2=E9=98=85=E6=B6=88=E6=81=AF=E4=B8=80=E9=97=AA=E8=80=8C?=
 =?UTF-8?q?=E8=BF=87=E7=9A=84bug=EF=BC=8C=E8=BF=98=E6=9C=89=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E4=B8=80=E4=BA=9B=E5=B0=8F=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/api.js                  |   3 +-
 images/icon/addr-line.png      | Bin 0 -> 2870 bytes
 lib/wxParse/wxParse.wxml       |   2 +-
 pages/app-auth/index.js        |  89 ++++++++++++++++++++++++++-------
 pages/app-auth/index.wxml      |   7 ++-
 pages/cart/cart.js             |   9 ++++
 pages/cart/cart.wxml           |   8 +--
 pages/cart/cart.wxss           |  18 +++++--
 pages/goods/goods.js           |  17 +++++--
 pages/goods/goods.wxml         |   1 +
 pages/goods/goods.wxss         |   4 +-
 pages/index/index.js           |  61 +++++++++++-----------
 pages/index/index.wxml         |   6 ++-
 pages/payOffline/index.wxml    |   1 +
 pages/payResult/payResult.js   |  18 +++++--
 pages/payResult/payResult.wxml |   1 +
 pages/payResult/payResult.wxss |   4 +-
 pages/ucenter/about/index.wxml |   1 +
 pages/ucenter/index/index.wxml |   3 +-
 services/pay.js                |   9 ----
 utils/util.js                  |  50 +++++++++---------
 21 files changed, 206 insertions(+), 106 deletions(-)
 create mode 100644 images/icon/addr-line.png

diff --git a/config/api.js b/config/api.js
index 288327c..5a2f238 100755
--- a/config/api.js
+++ b/config/api.js
@@ -1,5 +1,6 @@
 // const ApiRootUrl = 'http://localhost:8360/api/';
-const ApiRootUrl = 'https://www.hiolabs.com/api/';
+// const ApiRootUrl = 'http://192.168.0.108:8360/api/';
+const ApiRootUrl = 'https://www.guxiaoling.com:8466/api/';
 
 module.exports = {
     // 登录
diff --git a/images/icon/addr-line.png b/images/icon/addr-line.png
new file mode 100644
index 0000000000000000000000000000000000000000..004758c31f05b848fc30026a38f403a991860cea
GIT binary patch
literal 2870
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
U4;ta1`2YX_07*qoM6N<$f@v0V6#xJL

literal 0
HcmV?d00001

diff --git a/lib/wxParse/wxParse.wxml b/lib/wxParse/wxParse.wxml
index 6b41371..b6d2e2e 100644
--- a/lib/wxParse/wxParse.wxml
+++ b/lib/wxParse/wxParse.wxml
@@ -27,7 +27,7 @@
 </template>
 
 <template name="wxParseImg">
-    <image class="{{item.classStr}} wxParse-{{item.tag}}" data-from="{{item.from}}" data-src="{{item.attr.src}}"  data-idx="{{item.imgIndex}}"  src="{{item.attr.src}}" mode="aspectFit" bindload="wxParseImgLoad" bindtap="wxParseImgTap" style="width:{{item.width}}px;height:{{item.height}}px;{{item.attr.style}}"   />
+    <image class="{{item.classStr}} wxParse-{{item.tag}}" data-from="{{item.from}}" data-src="{{item.attr.src}}"  data-idx="{{item.imgIndex}}"  src="{{item.attr.src}}" mode="widthFix" bindload="wxParseImgLoad" bindtap="wxParseImgTap" style="width:{{item.width}}px;height:{{item.height}}px;{{item.attr.style}}"   />
 </template>
 
 <template name="WxEmojiView">
diff --git a/pages/app-auth/index.js b/pages/app-auth/index.js
index d58d3dc..0eccc28 100644
--- a/pages/app-auth/index.js
+++ b/pages/app-auth/index.js
@@ -6,10 +6,10 @@ const app = getApp()
 
 Page({
     data: {
-        
+
     },
     onLoad: function (options) {
-        
+
     },
     onShow: function () {
         let userInfo = wx.getStorageSync('userInfo');
@@ -17,23 +17,78 @@ Page({
             wx.navigateBack();
         };
     },
-    getUserInfo: function (e) {
-        app.globalData.userInfo = e.detail.userInfo
-        user.loginByWeixin().then(res => {
-            app.globalData.userInfo = res.data.userInfo;
-            app.globalData.token = res.data.token;
-            let is_new = res.data.is_new;//服务器返回的数据；
-            if (is_new == 0) {
-                util.showErrorToast('您已经是老用户啦！');
-                wx.navigateBack();
-            }
-            else if (is_new == 1) {
-                wx.navigateBack();
-            }
+    // getUserInfo: function (e) {
+    //     app.globalData.userInfo = e.detail.userInfo
+    //     user.loginByWeixin().then(res => {
+    //         app.globalData.userInfo = res.data.userInfo;
+    //         app.globalData.token = res.data.token;
+    //         let is_new = res.data.is_new;//服务器返回的数据；
+    //         if (is_new == 0) {
+    //             util.showErrorToast('您已经是老用户啦！');
+    //             wx.navigateBack();
+    //         }
+    //         else if (is_new == 1) {
+    //             wx.navigateBack();
+    //         }
 
-        }).catch((err) => { });
+    //     }).catch((err) => { });
+    // },
+
+    getUserProfile: function () {
+        // wx.navigateTo({
+        //     url: '/pages/app-auth/index',
+        // });
+        let that = this;
+        let code = '';
+        wx.login({
+            success: (res) => {
+                code = res.code;
+            },
+        });
+        // 获取用户信息
+        wx.getUserProfile({
+            lang: 'zh_CN',
+            desc: '用户登录',
+            success: (res) => {
+                let loginParams = {
+                    code: code,
+                    encryptedData: res.encryptedData,
+                    iv: res.iv,
+                    rawData: res.rawData,
+                    signature: res.signature
+                };
+                console.log(loginParams);
+                that.postLogin(loginParams);
+            },
+            // 失败回调
+            fail: () => {
+                // 弹出错误
+                App.showError('已拒绝小程序获取信息');
+            }
+        });
     },
-    goBack:function(){
+    postLogin(info) {
+        util.request(api.AuthLoginByWeixin, {
+            info: info
+        }, 'POST').then(function (res) {
+            console.log(res);
+            if (res.errno === 0) {
+                wx.setStorageSync('userInfo', res.data.userInfo);
+                wx.setStorageSync('token', res.data.token);
+                app.globalData.userInfo = res.data.userInfo;
+                app.globalData.token = res.data.token;
+                let is_new = res.data.is_new; //服务器返回的数据；
+                console.log(is_new);
+                if (is_new == 0) {
+                    util.showErrorToast('您已经是老用户啦！');
+                    wx.navigateBack();
+                } else if (is_new == 1) {
+                    wx.navigateBack();
+                }
+            }
+        });
+    },
+    goBack: function () {
         wx.navigateBack();
     }
 })
\ No newline at end of file
diff --git a/pages/app-auth/index.wxml b/pages/app-auth/index.wxml
index 0d98938..41bf742 100644
--- a/pages/app-auth/index.wxml
+++ b/pages/app-auth/index.wxml
@@ -5,9 +5,14 @@
     <view class='logo-name'>海风小店</view>
     <view class='intro'>开源微信小程序商城</view>
     <view class='login'>请完成微信授权以继续使用</view>
-    <button class='btn-login' open-type="getUserInfo" bindgetuserinfo='getUserInfo'>
+    <!-- <button class='btn-login' open-type="getUserInfo" bindgetuserinfo='getUserInfo'>
         <image src='/images/icon/weixin-w.png' class='img-w'></image>
         <view class='text'>微信快捷登录</view>
+    </button> -->
+    <button class='btn-login' bindtap='getUserProfile'>
+        <view class='img-w'></view>
+        <view class='text'>微信快捷登录</view>
     </button>
+
     <view class="cancel" bindtap="goBack">取消</view>
 </view>
\ No newline at end of file
diff --git a/pages/cart/cart.js b/pages/cart/cart.js
index f42d56f..108009a 100644
--- a/pages/cart/cart.js
+++ b/pages/cart/cart.js
@@ -30,6 +30,15 @@ Page({
         this.getCartList();
         this.getCartNum();
         wx.removeStorageSync('categoryId');
+    },
+    goGoodsDetail(e){
+        let goodsId = e.currentTarget.dataset.goodsid;
+        wx.navigateTo({
+          url: '/pages/goods/goods?id='+goodsId,
+        })
+    },
+    nothing:function(){
+
     },
     onPullDownRefresh: function() {
         wx.showNavigationBarLoading()
diff --git a/pages/cart/cart.wxml b/pages/cart/cart.wxml
index c62efd5..b39c75d 100644
--- a/pages/cart/cart.wxml
+++ b/pages/cart/cart.wxml
@@ -8,8 +8,8 @@
 				</view>
 				<image src="/images/icon/gou-gray.png" wx:else class="checkbox"></image>
 				<view class="goods-info">
-					<navigator class="goods-url" hover-class="none" url="/pages/goods/goods?id={{item.goods_id}}">
-						<view class="img-box">
+					<view class="goods-url">
+						<view class="img-box" bindtap="goGoodsDetail" data-goodsid="{{item.goods_id}}">
 							<image src="{{item.list_pic_url}}" class="img" />
 						</view>
 						<view class="text-box">
@@ -18,14 +18,14 @@
 							<view class="goods-price">
 								<view class='price-now'>￥{{item.retail_price}}</view>
 							</view>
-							<view class="selnum" wx:if="{{item.number > 0 && item.is_on_sale == 1}}">
+							<view class="selnum" catchtap="nothing" wx:if="{{item.number > 0 && item.is_on_sale == 1}}">
 								<view data-item-index="{{index}}" class="cut" catchtap="cutNumber">-</view>
 								<input value="{{item.number}}" class="number" disabled="true" type="number" />
 								<view data-item-index="{{index}}" class="add" catchtap="addNumber" disabled='{{disabled}}'>+</view>
 							</view>
 							<view wx:else class="out-stock">暂时缺货</view>
 						</view>
-					</navigator>
+					</view>
 				</view>
 			</view>
 			<view class="delete-btn" data-item-index="{{index}}" catchtap="deleteGoods">
diff --git a/pages/cart/cart.wxss b/pages/cart/cart.wxss
index 96531fa..3d50b21 100644
--- a/pages/cart/cart.wxss
+++ b/pages/cart/cart.wxss
@@ -231,7 +231,7 @@ button::after {
     border: none;
 }
 
-.goods-info .text-box .selnum {
+/* .goods-info .text-box .selnum {
     width: 146rpx;
     height: 52rpx;
     display: flex;
@@ -240,8 +240,21 @@ button::after {
     position: absolute;
     right: 30rpx;
     bottom: 0;
+} */
+
+.goods-info .text-box .selnum {
+    width: 146rpx;
+    height: 52rpx;
+    padding: 50rpx 0 0 100rpx;
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+    position: absolute;
+    right: 30rpx;
+    bottom: 0;
 }
 
+
 .selnum .cut {
     width: 46rpx;
     height: 46rpx;
@@ -345,7 +358,6 @@ button::after {
     width: 510rpx;
     /* justify-content: space-between; */
     line-height: 100rpx;
-    padding: 0 30rpx 0 0;
     font-size: 28rpx;
     box-sizing: border-box;
 }
@@ -367,5 +379,5 @@ button::after {
 .settle-box .total {
     color: #ff3456;
     float: left;
-    margin-left: 30rpx;
+    margin-left: 20rpx;
 }
diff --git a/pages/goods/goods.js b/pages/goods/goods.js
index 6d25c8e..c10caf5 100644
--- a/pages/goods/goods.js
+++ b/pages/goods/goods.js
@@ -125,7 +125,9 @@ Page({
                     galleryImages: galleryImages,
                     loading:1
                 });
-                WxParse.wxParse('goodsDetail', 'html', res.data.info.goods_desc, that);
+                setTimeout(() => {
+                    WxParse.wxParse('goodsDetail', 'html', res.data.info.goods_desc, that);
+                }, 1000);
                 wx.setStorageSync('goodsImage', res.data.info.https_pic_url);
             }
             else{
@@ -392,7 +394,6 @@ Page({
                 alone_text: '加入购物车'
             })
         } else {
-
             //提示选择完整规格
             if (!this.isCheckedAllSpec()) {
                 wx.showToast({
@@ -401,7 +402,6 @@ Page({
                 });
                 return false;
             }
-
             //根据选中的规格，判断是否有对应的sku信息
             let checkedProductArray = this.getCheckedProductItem(this.getCheckedSpecKey());
             if (!checkedProductArray || checkedProductArray.length <= 0) {
@@ -422,6 +422,10 @@ Page({
                 });
                 return false;
             }
+            wx.showLoading({
+              title: '',
+              mask:true
+            })
             util.request(api.CartAdd, {
                     addType: 0,
                     goodsId: this.data.id,
@@ -450,7 +454,7 @@ Page({
                             title: _res.errmsg,
                         });
                     }
-
+                    wx.hideLoading()
                 });
         }
     },
@@ -500,6 +504,10 @@ Page({
                 return false;
             }
             //添加到购物车
+            wx.showLoading({
+                title: '',
+                mask:true
+              })
             util.request(api.CartAdd, {
                     addType: 1, // 0：正常加入购物车，1:立即购买，2:再来一单
                     goodsId: this.data.id,
@@ -508,6 +516,7 @@ Page({
                 }, "POST")
                 .then(function(res) {
                     let _res = res;
+                    wx.hideLoading()
                     if (_res.errno == 0) {
                         let id = that.data.id;
                         wx.navigateTo({
diff --git a/pages/goods/goods.wxml b/pages/goods/goods.wxml
index 349beb3..cc6e819 100644
--- a/pages/goods/goods.wxml
+++ b/pages/goods/goods.wxml
@@ -55,6 +55,7 @@
     </view>
     <view class='details-wrap'>
         <view class="title">商品详情</view>
+        <!-- <ad unit-id="adunit-2d961509e15e91d7" ad-type="grid" grid-opacity="0.8" grid-count="5" ad-theme="white"></ad> -->
         <view class="show">
             <view class='details-image-wrap'>
                 <import src="../../lib/wxParse/wxParse.wxml" />
diff --git a/pages/goods/goods.wxss b/pages/goods/goods.wxss
index bc1bfed..03374ed 100644
--- a/pages/goods/goods.wxss
+++ b/pages/goods/goods.wxss
@@ -14,7 +14,9 @@
     width: 100%;
 }
 
-
+.ad-video{
+    width: 100%;
+}
 .loading {
     width: 100%;
     height: 100%;
diff --git a/pages/index/index.js b/pages/index/index.js
index 7eec67b..ca2bea0 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -12,14 +12,27 @@ Page({
         showChannel: 0,
         showBanner: 0,
         showBannerImg: 0,
-        goodsCount: 0,
         banner: [],
         index_banner_img: 0,
         userInfo: {},
         imgurl: '',
         sysHeight: 0,
         loading: 0,
-        autoplay:true
+        autoplay:true,
+        showContact:1,
+    },
+    onPageScroll: function (e) {
+        let scrollTop = e.scrollTop;
+        let that = this;
+        if (scrollTop >= 2000) {
+            that.setData({
+                showContact: 0
+            })
+        } else {
+            that.setData({
+                showContact: 1
+            })
+        }
     },
     onHide:function(){
         this.setData({
@@ -38,14 +51,6 @@ Page({
             url: '/pages/category/index',
         })
     },
-    getCatalog: function () {
-        let that = this;
-        util.request(api.GoodsCount).then(function (res) {
-            that.setData({
-                goodsCount: res.data.goodsCount
-            });
-        });
-    },
     handleTap: function (event) {
         //阻止冒泡 
     },
@@ -73,17 +78,25 @@ Page({
                     notice: res.data.notice,
                     loading: 1,
                 });
+                let cartGoodsCount = '';
+                if (res.data.cartCount == 0) {
+                    wx.removeTabBarBadge({
+                        index: 2,
+                    })
+                } else {
+                    cartGoodsCount = res.data.cartCount + '';
+                    wx.setTabBarBadge({
+                        index: 2,
+                        text: cartGoodsCount
+                    })
+                }
             }
         });
     },
     onLoad: function (options) {
-        let systemInfo = wx.getStorageSync('systemInfo');
-        var scene = decodeURIComponent(options.scene);
-        this.getCatalog();
+        this.getChannelShowInfo();
     },
     onShow: function () {
-        this.getCartNum();
-        this.getChannelShowInfo();
         this.getIndexData();
         var that = this;
         let userInfo = wx.getStorageSync('userInfo');
@@ -100,24 +113,6 @@ Page({
         });
         wx.removeStorageSync('categoryId');
     },
-    getCartNum: function () {
-        util.request(api.CartGoodsCount).then(function (res) {
-            if (res.errno === 0) {
-                let cartGoodsCount = '';
-                if (res.data.cartTotal.goodsCount == 0) {
-                    wx.removeTabBarBadge({
-                        index: 2,
-                    })
-                } else {
-                    cartGoodsCount = res.data.cartTotal.goodsCount + '';
-                    wx.setTabBarBadge({
-                        index: 2,
-                        text: cartGoodsCount
-                    })
-                }
-            }
-        });
-    },
     getChannelShowInfo: function (e) {
         let that = this;
         util.request(api.ShowSettings).then(function (res) {
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 155664e..56d64dc 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,5 +1,5 @@
 <view class="container" wx:if="{{loading == 1}}">
-    <view class='contact-wrap'>
+    <view class='contact-wrap' wx:if="{{showContact == 1}}">
         <button class="contact-btn" session-from='{"nickName":"{{userInfo.nickname}}","avatarUrl":"{{userInfo.avatar}}"}' open-type="contact">
             <image class='icon' src='/images/icon/contact.png'></image>
             <view class='text'>客服</view>
@@ -7,7 +7,7 @@
     </view>
     <view class="search" bindtap="goSearch">
         <image class="icon" src="/images/icon/search.png"></image>
-        <text class="txt">搜索, 共{{goodsCount}}款好物</text>
+        <text class="txt">搜索,发现更多好物</text>
     </view>
     <view class='banner-wrap' wx:if="{{show_banner && banner.length > 0}}">
         <swiper class="banner" indicator-dots="true" autoplay="{{autoplay}}" interval="3000" duration="1000"   >
@@ -34,6 +34,7 @@
             </swiper-item>
         </swiper>
     </view>
+    <!-- <ad unit-id="adunit-c755904541658aa1" ad-type="grid" grid-opacity="0.8" grid-count="5" ad-theme="white"></ad> -->
     <swiper class="catalog-wrap" indicator-dots="{{false}}" indicator-color="#dedede" indicator-active-color="#e00000" wx:if="{{show_channel}}">
         <swiper-item class="first">
             <view wx:for="{{channel}}" wx:if="{{item.sort_order < 7}}" wx:key="id" class='icon-navi' data-cateid="{{item.id}}" bindtap="goCategory">
@@ -95,6 +96,7 @@
             <view class="more-category" data-cateid="{{item.id}}" bindtap="goCategory">点击查看更多{{item.name}}</view>
         </view>
     </view>
+    <!-- <ad unit-id="adunit-b6fcdb43b7913591"></ad> -->
     <view class="no-more-goods ">没有更多商品啦</view>
 </view>
 <view class="loading" style="height:{{sysHeight}}px" wx:else>
diff --git a/pages/payOffline/index.wxml b/pages/payOffline/index.wxml
index 21ae92b..a7f26b8 100755
--- a/pages/payOffline/index.wxml
+++ b/pages/payOffline/index.wxml
@@ -25,4 +25,5 @@
         </view>
         <view class='btn-go-order' bindtap="toOrderListPage">返回我的页面</view>
     </view>
+    <!-- <ad unit-id="adunit-f572025851df64b3" ad-type="video" ad-theme="white"></ad> -->
 </view>
\ No newline at end of file
diff --git a/pages/payResult/payResult.js b/pages/payResult/payResult.js
index 700fa64..c6a639b 100755
--- a/pages/payResult/payResult.js
+++ b/pages/payResult/payResult.js
@@ -24,9 +24,21 @@ Page({
         });
     },
     toIndex: function() {
-        wx.switchTab({
-            url: '/pages/index/index'
-        });
+        wx.requestSubscribeMessage({
+            tmplIds: ['w6AMCJ0FI2LqjCjWPIrpnVWTsFgnlNlmCf9TTDmG6_U'],
+            success(res) {
+                console.log(res);
+                wx.switchTab({
+                    url: '/pages/index/index'
+                });
+            },
+            fail(err) {
+                console.log(err);
+                wx.switchTab({
+                    url: '/pages/index/index'
+                });
+            }
+        })
     },
     payOrder() {
         pay.payOrder(parseInt(this.data.orderId)).then(res => {
diff --git a/pages/payResult/payResult.wxml b/pages/payResult/payResult.wxml
index d231f0b..a9b24ef 100755
--- a/pages/payResult/payResult.wxml
+++ b/pages/payResult/payResult.wxml
@@ -28,4 +28,5 @@
         </view>
         <view class='btn-go-order' bindtap="toOrderListPage">返回我的页面</view>
     </view>
+    <!-- <ad class="ad-video" unit-id="adunit-f572025851df64b3" ad-type="video" ad-theme="white"></ad> -->
 </view>
\ No newline at end of file
diff --git a/pages/payResult/payResult.wxss b/pages/payResult/payResult.wxss
index ac5f841..6b10f3f 100755
--- a/pages/payResult/payResult.wxss
+++ b/pages/payResult/payResult.wxss
@@ -8,7 +8,9 @@ page {
     align-items: flex-start;
     overflow-x: hidden;
 }
-
+.ad-video{
+    width: 100%;
+}
 .result-wrap {
     width: 100%;
     height: 40%;
diff --git a/pages/ucenter/about/index.wxml b/pages/ucenter/about/index.wxml
index d366012..1f14895 100644
--- a/pages/ucenter/about/index.wxml
+++ b/pages/ucenter/about/index.wxml
@@ -12,4 +12,5 @@
             更多信息访问：hiolabs.com
         </view>
     </view>
+    <!-- <ad unit-id="adunit-1776b4f8f2217197" ad-type="video" ad-theme="white"></ad> -->
 </view>
\ No newline at end of file
diff --git a/pages/ucenter/index/index.wxml b/pages/ucenter/index/index.wxml
index 3c2ae9e..ba1489c 100644
--- a/pages/ucenter/index/index.wxml
+++ b/pages/ucenter/index/index.wxml
@@ -24,6 +24,7 @@
             </view>
         </view>
     </view>
+    <!-- <ad unit-id="adunit-89ae0a0b6860dc9f" ad-type="grid" grid-opacity="0.8" grid-count="5" ad-theme="white"></ad> -->
     <view class="order-container">
         <view class='header' data-index='0' bindtap='toOrderListTap'>
             <view class='top-title'>
@@ -103,7 +104,7 @@
         </view>
     </view>
     <view class="company">
-        <view class="c-wrap">
+        <view class="c-wrap" bindtap="getOrderInfo">
             <view class="text">海风小店</view>
             <view class="line"></view>
         </view>
diff --git a/services/pay.js b/services/pay.js
index a2ac46a..c5a5f7d 100644
--- a/services/pay.js
+++ b/services/pay.js
@@ -19,15 +19,6 @@ function payOrder(orderId) {
                     'signType': payParam.signType,
                     'paySign': payParam.paySign,
                     'success': function(res) {
-                        wx.requestSubscribeMessage({
-                            tmplIds: ['w6AMCJ0FI2LqjCjWPIrpnVWTsFgnlNlmCf9TTDmG6_U'],
-                            success(res) {
-                                console.log(res);
-                            },
-                            fail(err) {
-                                console.log(err);
-                            }
-                        })
                         resolve(res);
                     },
                     'fail': function(res) {
diff --git a/utils/util.js b/utils/util.js
index 849216f..2bcd164 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -74,7 +74,7 @@ function request(url, data = {}, method = "GET") {
             method: method,
             header: {
                 'Content-Type': 'application/json',
-                'X-Nideshop-Token': wx.getStorageSync('token')
+                'X-Hioshop-Token': wx.getStorageSync('token')
             },
             success: function(res) {
                 if (res.statusCode == 200) {
@@ -82,30 +82,30 @@ function request(url, data = {}, method = "GET") {
                     if (res.data.errno == 401) {
                         //需要登录后才可以操作
 
-                        let code = null;
-                        return login().then((res) => {
-                            code = res.code;
-                            return getUserInfo();
-                        }).then((userInfo) => {
-                            //登录远程服务器
-                            request(api.AuthLoginByWeixin, {
-                                code: code,
-                                userInfo: userInfo
-                            }, 'POST').then(res => {
-                                if (res.errno === 0) {
-                                    //存储用户信息
-                                    wx.setStorageSync('userInfo', res.data.userInfo);
-                                    wx.setStorageSync('token', res.data.token);
-                                    resolve(res);
-                                } else {
-                                    reject(res);
-                                }
-                            }).catch((err) => {
-                                reject(err);
-                            });
-                        }).catch((err) => {
-                            reject(err);
-                        })
+                        // let code = null;
+                        // return login().then((res) => {
+                        //     code = res.code;
+                        //     return getUserInfo();
+                        // }).then((userInfo) => {
+                        //     //登录远程服务器
+                        //     request(api.AuthLoginByWeixin, {
+                        //         code: code,
+                        //         userInfo: userInfo
+                        //     }, 'POST').then(res => {
+                        //         if (res.errno === 0) {
+                        //             //存储用户信息
+                        //             wx.setStorageSync('userInfo', res.data.userInfo);
+                        //             wx.setStorageSync('token', res.data.token);
+                        //             resolve(res);
+                        //         } else {
+                        //             reject(res);
+                        //         }
+                        //     }).catch((err) => {
+                        //         reject(err);
+                        //     });
+                        // }).catch((err) => {
+                        //     reject(err);
+                        // })
                     } else {
                         resolve(res.data);
                     }