滨海

王楠
Components/concat/concat.js
Components/concat/concat.wxml
app.json
pages/index/index.js
pages/index/index.wxml
pages/register/register.js
pages/register/register.wxml
pages/shop_cart/shop_cart.wxml
pages/shop_cart/shop_cart.wxss
pages/zhuanqu/zhuanqu.wxml
project.config.json
--- a/Components/concat/concat.js
查看文件 @8e65123
+++ b/Components/concat/concat.js
查看文件 @8e65123
@@ -22,6 +22,11 @@ Component({
       wx.makePhoneCall({
         phoneNumber: wx.getStorageSync('tel')
       })
+    },
+    tokefu(){
+      wx.navigateTo({
+        url: '/pages/kefu/kefu',
+      })
     }
   }
 })
--- a/Components/concat/concat.wxml
查看文件 @8e65123
+++ b/Components/concat/concat.wxml
查看文件 @8e65123
 <view class="concat_box">
-  <image src="/images/icon_65.png"  class="item" />
-  <button open-type="contact" plain="true" class="dadianhua"></button>
+  <button bindtap="tokefu" class="item" plain="true">
+    <image src="/images/icon_65.png" />
+  </button>
   <view class="item" catchtap="tel">
     <image src="/images/bodadianhua_icon.png" />
   </view>
--- a/app.json
查看文件 @8e65123
+++ b/app.json
查看文件 @8e65123
 {
-  "pages": [
-    "pages/index/index",
-    "pages/chailvcode/chailvcode",
-    "pages/login/login",
-    "pages/register/register",
-    "pages/coupon/coupon",
-    "pages/lingqucoupon/lingqucoupon",
-    "pages/startindex/startindex",
-    "pages/zuji/zuji",
-    "pages/messagedetail/messagedetail",
-    "pages/message/message",
-    "pages/shop_cart/shop_cart",
-    "pages/classify/classify",
-    "pages/my/my",
-    "pages/shop_detail/shop_detail",
-    "pages/order/order",
-    "pages/Collection/collection",
-    "pages/order/return_goods/return_goods",
-    "pages/my/about_us/about_us",
-    "pages/my/my_integral/my_integral",
-    "pages/address/address",
-    "pages/address/edit_address/edit_address",
-    "pages/address/add_address/add_address",
-    "pages/search/search",
-    "pages/search/search_result/search_result",
-    "pages/order/order_list/order_list",
-    "pages/order/order_detail/order_detail",
-    "pages/logistics/logistics",
-    "pages/notice/notice",
-    "pages/outerChain/outerChain",
-    "pages/zhuanqu/zhuanqu",
-    "pages/taocandetail/taocandetail",
-    "pages/taocanpay/taocanpay",
-    "pages/orderdetail/orderdetail",
-    "pages/xianshi/xianshi",
-    "pages/coupon",
-    "pages/pinpaibox/pinpaibox",
-    "pages/jumplink/jumplink",
-    "pages/birthday/birthday"
-  ],
-  "subpackages": [
-    {
-      "root": "packageA",
-      "pages": [
+    "pages": [
         "pages/index/index",
-        "pages/register/register",
+        "pages/chailvcode/chailvcode",
         "pages/login/login",
+        "pages/register/register",
+        "pages/coupon/coupon",
+        "pages/lingqucoupon/lingqucoupon",
         "pages/startindex/startindex",
         "pages/zuji/zuji",
         "pages/messagedetail/messagedetail",
-        "pages/message/message", 
+        "pages/message/message",
         "pages/shop_cart/shop_cart",
         "pages/classify/classify",
         "pages/my/my",
@@ -60,11 +20,11 @@
         "pages/my/about_us/about_us",
         "pages/my/my_integral/my_integral",
         "pages/address/address",
-        "pages/address/edit_address/edit_address", 
+        "pages/address/edit_address/edit_address",
         "pages/address/add_address/add_address",
         "pages/search/search",
         "pages/search/search_result/search_result",
-        "pages/order/order_list/order_list",  
+        "pages/order/order_list/order_list",
         "pages/order/order_detail/order_detail",
         "pages/logistics/logistics",
         "pages/notice/notice",
@@ -73,51 +33,94 @@
         "pages/taocandetail/taocandetail",
         "pages/taocanpay/taocanpay",
         "pages/orderdetail/orderdetail",
-        "pages/xianshi/xianshi"
-      ]
-    }
-  ],
-  "preloadRule":{
-    "pages/index/index":{
-      "network":"all",
-      "packages": ["packageA"]
-    }
-  },
-  "window": {
-    "backgroundTextStyle": "light",
-    "navigationBarBackgroundColor": "#3D9AF8",
-    "navigationBarTitleText": "海创诚品",
-    "navigationBarTextStyle": "white"
-  },
-  "tabBar": {
-    "custom": true,
-    "list": [
-      {
-        "pagePath": "pages/index/index",
-        "text": "商品",
-        "iconPath": "images/tabbar/icon_75.png",
-        "selectedIconPath": "images/tabbar/icon_68.png"
-      },
-      {
-        "pagePath": "pages/message/message",
-        "text": "消息",
-        "iconPath": "images/tabbar/message.png",
-        "selectedIconPath": "images/tabbar/messageactive.png"
-      },
-      {
-        "pagePath": "pages/shop_cart/shop_cart",
-        "text": "购物车",
-        "iconPath": "images/tabbar/icon_70.png",
-        "selectedIconPath": "images/tabbar/icon_73.png"
-      },
-      {
-        "pagePath": "pages/my/my",
-        "text": "我的",
-        "iconPath": "images/tabbar/icon_71.png",
-        "selectedIconPath": "images/tabbar/icon_72.png"
-      }
+        "pages/xianshi/xianshi",
+        "pages/coupon",
+        "pages/pinpaibox/pinpaibox",
+        "pages/jumplink/jumplink",
+        "pages/birthday/birthday",
+        "pages/kefu/kefu"
+    ],
+    "subpackages": [
+        {
+            "root": "packageA",
+            "pages": [
+                "pages/index/index",
+                "pages/register/register",
+                "pages/login/login",
+                "pages/startindex/startindex",
+                "pages/zuji/zuji",
+                "pages/messagedetail/messagedetail",
+                "pages/message/message",
+                "pages/shop_cart/shop_cart",
+                "pages/classify/classify",
+                "pages/my/my",
+                "pages/shop_detail/shop_detail",
+                "pages/order/order",
+                "pages/Collection/collection",
+                "pages/order/return_goods/return_goods",
+                "pages/my/about_us/about_us",
+                "pages/my/my_integral/my_integral",
+                "pages/address/address",
+                "pages/address/edit_address/edit_address",
+                "pages/address/add_address/add_address",
+                "pages/search/search",
+                "pages/search/search_result/search_result",
+                "pages/order/order_list/order_list",
+                "pages/order/order_detail/order_detail",
+                "pages/logistics/logistics",
+                "pages/notice/notice",
+                "pages/outerChain/outerChain",
+                "pages/zhuanqu/zhuanqu",
+                "pages/taocandetail/taocandetail",
+                "pages/taocanpay/taocanpay",
+                "pages/orderdetail/orderdetail",
+                "pages/xianshi/xianshi"
+            ]
+        }
     ],
-    "selectedColor": "#05091A"
-  },
-  "sitemapLocation": "sitemap.json"
+    "preloadRule": {
+        "pages/index/index": {
+            "network": "all",
+            "packages": [
+                "packageA"
+            ]
+        }
+    },
+    "window": {
+        "backgroundTextStyle": "light",
+        "navigationBarBackgroundColor": "#3D9AF8",
+        "navigationBarTitleText": "海创诚品",
+        "navigationBarTextStyle": "white"
+    },
+    "tabBar": {
+        "custom": true,
+        "list": [
+            {
+                "pagePath": "pages/index/index",
+                "text": "商品",
+                "iconPath": "images/tabbar/icon_75.png",
+                "selectedIconPath": "images/tabbar/icon_68.png"
+            },
+            {
+                "pagePath": "pages/message/message",
+                "text": "消息",
+                "iconPath": "images/tabbar/message.png",
+                "selectedIconPath": "images/tabbar/messageactive.png"
+            },
+            {
+                "pagePath": "pages/shop_cart/shop_cart",
+                "text": "购物车",
+                "iconPath": "images/tabbar/icon_70.png",
+                "selectedIconPath": "images/tabbar/icon_73.png"
+            },
+            {
+                "pagePath": "pages/my/my",
+                "text": "我的",
+                "iconPath": "images/tabbar/icon_71.png",
+                "selectedIconPath": "images/tabbar/icon_72.png"
+            }
+        ],
+        "selectedColor": "#05091A"
+    },
+    "sitemapLocation": "sitemap.json"
 }
--- a/pages/index/index.js
查看文件 @8e65123
+++ b/pages/index/index.js
查看文件 @8e65123
@@ -138,8 +138,8 @@ Page({
     let login = wx.getStorageSync('login')
     let sq = wx.getStorageSync('sq')
     console.log(token)
-   
-    if (token == ''||sq==2) {
+
+    if (token == '' || sq == 2) {
       // wx.showToast({
       //   title: '请登录后操作',
       //   icon: 'none',
@@ -184,7 +184,7 @@ Page({
     let sq = wx.getStorageSync('gh_sq')
     console.log(token)
     console.log(sq)
-    if (token == ''||sq == 2) {
+    if (token == '' || sq == 2) {
       // wx.showLoading({
       //   title: '模块加载中',
       // })
@@ -229,7 +229,7 @@ Page({
     let cb_login = wx.getStorageSync('cb_login');
     let sq = wx.getStorageSync('cb_sq')
     console.log(token)
-    if (token == ''||sq==2) {
+    if (token == '' || sq == 2) {
       // wx.showLoading({
       //   title: '模块加载中',
       // })
@@ -740,15 +740,15 @@ Page({
     // } else {
     //   let login_new = wx.getStorageSync('login');
-    //   if (style == 2) {
-    //     wx.navigateTo({
-    //       url: '/pages/outerChain/outerChain?src=' + e.currentTarget.dataset.src
-    //     })
-    //   } else {
-    wx.navigateTo({
-      url: '/pages/shop_detail/shop_detail?id=' + id
-    })
-    // }
+    if (style == 2) {
+      wx.navigateTo({
+        url: '/pages/outerChain/outerChain?src=' + e.currentTarget.dataset.src
+      })
+    } else {
+      wx.navigateTo({
+        url: '/pages/shop_detail/shop_detail?id=' + id
+      })
+    }
     // }
   },
--- a/pages/index/index.wxml
查看文件 @8e65123
+++ b/pages/index/index.wxml
查看文件 @8e65123
@@ -105,7 +105,6 @@
 						<view class="hotgoodimg">
 							<image src="{{activity[0].image}}"></image>
 						</view>
-
 					</view>
 				</view>
--- a/pages/register/register.js
查看文件 @8e65123
+++ b/pages/register/register.js
查看文件 @8e65123
@@ -10,16 +10,16 @@ Page({
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function(options) {
+  onLoad: function (options) {
     this.getCodeFun();
-    
+
   },
   // 进入页面获取code
   getCodeFun() {
     let that = this;
     wx.login({
-      success: function(r) {
+      success: function (r) {
         that.setData({
           code: r.code
         })
@@ -32,10 +32,10 @@ Page({
                     iv: reg.iv,
                     encryptedData: reg.encryptedData
                   })
-                  if(that.data.iv){
+                  if (that.data.iv) {
                     that.get_token()
                   }
-                  
+
                 }
               })
             }
@@ -49,29 +49,58 @@ Page({
   // 立即授权
   get_info(e) {
     let that = this
-    if (e.detail.errMsg == 'getUserInfo:ok'){
-      that.setData({
-        iv: e.detail.iv,
-        encryptedData: e.detail.encryptedData
-      })
-      if(that.data.iv){
-        wx.login({
-          success: function(r) {
-            that.setData({
-              code: r.code
+    wx.getUserProfile({
+      desc: '用于完善会员资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
+      success: (res) => {
+          console.log(res.iv)
+          that.setData({
+            iv: res.iv,
+            encryptedData: res.encryptedData
+          })
+          if(that.data.iv){
+          
+            wx.login({
+              success: function(r) {
+                that.setData({
+                  code: r.code
+                })
+                that.get_token()
+              }
             })
-            that.get_token()
+    
+          
           }
-        })
-
-      
+          
+      },
+      fail() {
+          wx.navigateBack({
+              delta: 0,
+          })
       }
-     
-    } 
+  })
+    // if (e.detail.errMsg == 'getUserInfo:ok') {
+    //   that.setData({
+    //     iv: e.detail.iv,
+    //     encryptedData: e.detail.encryptedData
+    //   })
+    //   if (that.data.iv) {
+    //     wx.login({
+    //       success: function (r) {
+    //         that.setData({
+    //           code: r.code
+    //         })
+    //         that.get_token()
+    //       }
+    //     })
+
+
+    //   }
+
+    // }
   },
-// 获取登录注册信息
-  get_token(){
+  // 获取登录注册信息
+  get_token() {
     wx.showLoading({
       title: '加载中',
     })
@@ -89,11 +118,17 @@ Page({
           if (r.code == 200) {
             wx.setStorageSync('token', r.token);
             wx.setStorageSync('tel', r.tel);
-         
+
             // wx.setStorageSync('token', 'C9c4f9e702e05dae61d854c0c2dd6e21a');
             wx.setStorageSync('login', r.new_login);
             wx.setStorageSync('gh_login', r.gh_login);
             wx.setStorageSync('cb_login', r.cb_login);
+            wx.setStorageSync('sq', JSON.parse(r.sq1.msg).data)
+            wx.setStorageSync('gh_sq', JSON.parse(r.sq2.msg).data)
+            wx.setStorageSync('cb_sq', JSON.parse(r.sq3.msg).data)
+              wx.navigateBack({
+              delta: 0,
+            })
             // wx.setStorageSync('tel', r.tel);
             // wx.reLaunch({
             //   url: '/pages/index/index'
@@ -101,9 +136,7 @@ Page({
             // wx.reLaunch({
             //   url: '/pages/index/index'
             // })
-            wx.navigateBack({
-              delta: 0,
-            })
+          
             // if (r.new_login == 0) {
             //   // 未绑定手机号
             //   wx.redirectTo({
@@ -124,7 +157,7 @@ Page({
       }
     })
-    
+
   },
@@ -137,49 +170,49 @@ Page({
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
-  onReady: function() {
+  onReady: function () {
   },
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow: function() {
+  onShow: function () {
   },
   /**
    * 生命周期函数--监听页面隐藏
    */
-  onHide: function() {
+  onHide: function () {
   },
   /**
    * 生命周期函数--监听页面卸载
    */
-  onUnload: function() {
+  onUnload: function () {
   },
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    */
-  onPullDownRefresh: function() {
+  onPullDownRefresh: function () {
   },
   /**
    * 页面上拉触底事件的处理函数
    */
-  onReachBottom: function() {
+  onReachBottom: function () {
   },
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function() {
+  onShareAppMessage: function () {
   }
 })
--- a/pages/register/register.wxml
查看文件 @8e65123
+++ b/pages/register/register.wxml
查看文件 @8e65123
@@ -9,6 +9,6 @@
   </view>
 </view>
 <view class="button_box">
-  <button class="login" open-type="getUserInfo" lang="zh_CN" bindgetuserinfo="get_info">立即授权</button>
+  <button class="login" lang="zh_CN" bindtap="get_info">立即授权</button>
   <view class="no_login" bindtap="returnPageFun">暂不授权</view>
 </view>
--- a/pages/shop_cart/shop_cart.wxml
查看文件 @8e65123
+++ b/pages/shop_cart/shop_cart.wxml
查看文件 @8e65123
@@ -20,20 +20,17 @@
 		<shop_item list="{{list}}" wx:if="{{list.length>0}}" type="1" actioning='{{actioning}}' check_num="{{check_num}}" bindcheck_type="check_type" bindchange_num="change_num" binddelete_shop="delete_shop" />
 		<view class="empty" wx:else>暂无更多数据</view>
 	</view>
-<!--  wx:if="{{list.length>0}}" -->
-<!-- footer -->
-		<view class="footer" wx:if="{{list.length>0}}">
-			<view class="check_box" bindtap="check_all">
-				<image class="check" src="{{checkAll?'/images/check@.png':'/images/check.png'}}" />
-				<text>全选</text>
-			</view>
-			<view class="tips_info" wx:if="{{editshow}}">
-				<text>不含运费</text>合计
-				<text>{{integral}}元</text>
-			</view>
-			<view class="submit" bindtap="submit" wx:if="{{editshow}}">结算（{{all_num}}）</view>
-		</view>
-	<concat />
+	<view class="footer" wx:if="{{list.length>0}}">
+		<view class="check_box" bindtap="check_all">
+			<image class="check" src="{{checkAll?'/images/check@.png':'/images/check.png'}}" />
+			<text>全选</text>
+		</view>
+		<view class="tips_info" wx:if="{{editshow}}">
+			<text>不含运费</text>合计
+			<text>{{integral}}元</text>
+		</view>
+		<view class="submit" bindtap="submit" wx:if="{{editshow}}">结算（{{all_num}}）</view>
+	</view>
 </block>
 <v-tab-bar selected="{{selected}}" text="1" list="{{listarr}}"></v-tab-bar>
--- a/pages/shop_cart/shop_cart.wxss
查看文件 @8e65123
+++ b/pages/shop_cart/shop_cart.wxss
查看文件 @8e65123
@@ -37,6 +37,7 @@ page {
   background: #fff;
   position: fixed;
   left: 0;
+  bottom: calc(100rpx + constant(safe-area-inset-bottom));
   bottom: calc(100rpx + env(safe-area-inset-bottom));
   font-size: 26rpx;
   font-family: PingFang SC;
--- a/pages/zhuanqu/zhuanqu.wxml
查看文件 @8e65123
+++ b/pages/zhuanqu/zhuanqu.wxml
查看文件 @8e65123
@@ -18,7 +18,8 @@
     <Model_item list="{{shop_arr}}" type='open' />
     <view class='real_goods' wx:if="{{activelist.length>0}}">
-      <view class="real_goods_item" wx:for="{{activelist}}" wx:key="index" data-id="{{item.goods_id}}" bindtap="{{item.product.sold==0?'':'look_more'}}" data-type="{{item.type}}">
+      <view class="real_goods_item" wx:for="{{activelist}}" wx:key="index" data-id="{{item.goods_id}}"
+        bindtap="{{item.product.sold==0?'':'look_more'}}" data-type="{{item.type}}">
         <view wx:if="{{item.type==1}}">
           <view class='real_goods_img'>
@@ -27,14 +28,14 @@
           </view>
           <view class='real_goods_bottom'>
             <view class='goods_title'>{{item.goods.name}}</view>
-              <view class='goods_flex'>
-                <!-- <view class='score'>积分</view> -->
-                <view class='price'>￥{{item.goods.goods_price}}</view>
-               <view class="huaxianprice">￥{{item.goods.line_price}}</view>
-              </view>
- <view class='sell'>已卖出{{item.goods.sales}}件</view>
-              <!-- <view class='oldprice'>{{item.product.price}}</view> -->
-          
+            <view class='goods_flex'>
+              <!-- <view class='score'>积分</view> -->
+              <view class='price'>￥{{item.goods_price}}</view>
+              <view class="huaxianprice">￥{{item.goods.line_price}}</view>
+            </view>
+            <view class='sell'>已卖出{{item.goods.sales}}件</view>
+            <!-- <view class='oldprice'>{{item.product.price}}</view> -->
+
           </view>
           <view class="pink_cover" wx:if="{{item.product.sold == 0}}" />
         </view>
--- a/project.config.json
查看文件 @8e65123
+++ b/project.config.json
查看文件 @8e65123
@@ -4,7 +4,7 @@
         "ignore": []
     },
     "setting": {
-        "urlCheck": false,
+        "urlCheck": true,
         "es6": true,
         "enhance": false,
         "postcss": true,