修改分包

@@ -22,11 +22,6 @@ Component({
       wx.makePhoneCall({
         phoneNumber: wx.getStorageSync('tel')
       })
-    },
-    tokefu(){
-      wx.navigateTo({
-        url: '/pages/kefu/kefu',
-      })
     }
   }
 })

 <view class="concat_box">
-  <button bindtap="tokefu" class="item" plain="true">
-    <image src="/images/icon_65.png" />
-  </button>
+  <image src="/images/icon_65.png"  class="item" />
+  <button open-type="contact" plain="true" class="dadianhua"></button>
   <view class="item" catchtap="tel">
     <image src="/images/bodadianhua_icon.png" />
   </view>

@@ -54,7 +54,7 @@ App({
         //工会商城入口
         baseUrl = 'https://binhaigh.w.broing.cn/api';
       } else if (entrance_type == '3') {
-        //采办商城入口
+        //工会商城入口
         baseUrl = 'https://bgcb.w.broing.cn/api';
       }
       //  天远甄选

 {
-    "pages": [
+  "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/index/index",
-        "pages/chailvcode/chailvcode",
-        "pages/login/login",
         "pages/register/register",
-        "pages/coupon/coupon",
-        "pages/lingqucoupon/lingqucoupon",
+        "pages/login/login",
         "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",
@@ -20,11 +60,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",
@@ -33,94 +73,51 @@
         "pages/taocandetail/taocandetail",
         "pages/taocanpay/taocanpay",
         "pages/orderdetail/orderdetail",
-        "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"
-            ]
-        }
+        "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"
+      }
     ],
-    "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"
+    "selectedColor": "#05091A"
+  },
+  "sitemapLocation": "sitemap.json"
 }
\ No newline at end of file

@@ -138,7 +138,7 @@ Page({
     let login = wx.getStorageSync('login')
     let sq = wx.getStorageSync('sq')
     console.log(token)
-    console.log(sq)
+
     if (token == '' || sq == 2) {
       // wx.showToast({
       //   title: '请登录后操作',

@@ -105,6 +105,7 @@
 						<view class="hotgoodimg">
 							<image src="{{activity[0].image}}"></image>
 						</view>
+
 					</view>
 				</view>
 

@@ -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,66 +49,36 @@ Page({
   // 立即授权
   get_info(e) {
     let that = this
-    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()
-              }
+    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()
           }
-          
-      },
-      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: '加载中',
     })
     let that = this
     wx.checkSession({
       success(res) {
-     
         let u = a.interface.openid;
-        console.log(u)
         let d = {
           code: that.data.code,
           iv: that.data.iv,
@@ -116,35 +86,45 @@ Page({
         }
         a.post(u, d).then((r) => {
           wx.hideLoading()
-          console.log(r)
           if (r.code == 200) {
-            console.log(r)
-            wx.hideLoading()
             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', r.sq1)
-            wx.setStorageSync('gh_sq', r.sq2)
-            wx.setStorageSync('cb_sq', r.sq3)
+            // wx.setStorageSync('tel', r.tel);
+            // wx.reLaunch({
+            //   url: '/pages/index/index'
+            // })
+            // wx.reLaunch({
+            //   url: '/pages/index/index'
+            // })
             wx.navigateBack({
               delta: 0,
             })
-           
+            // if (r.new_login == 0) {
+            //   // 未绑定手机号
+            //   wx.redirectTo({
+            //     url: '/pages/login/login'
+            //   })
+            // } else if (r.new_login == 1) {
+            //   wx.reLaunch({
+            //     url: '/pages/index/index'
+            //   })
+            // }
           }
         }).catch((er) => { })
-      },
+      }
+      ,
       fail(err) {
-        console.log(err)
         wx.hideLoading();
         that.getCodeFun()
       }
     })
 
-
+    
   },
 
 
@@ -157,49 +137,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() {
 
   }
 })
\ No newline at end of file

@@ -9,6 +9,6 @@
   </view>
 </view>
 <view class="button_box">
-  <button class="login" lang="zh_CN" bindtap="get_info">立即授权</button>
+  <button class="login" open-type="getUserInfo" lang="zh_CN" bindgetuserinfo="get_info">立即授权</button>
   <view class="no_login" bindtap="returnPageFun">暂不授权</view>
 </view>
\ No newline at end of file

@@ -20,17 +20,20 @@
 		<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>
-
-	<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>
+<!--  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>
-		<view class="submit" bindtap="submit" wx:if="{{editshow}}">结算（{{all_num}}）</view>
-	</view>
+
+	<concat />
 </block>
 <v-tab-bar selected="{{selected}}" text="1" list="{{listarr}}"></v-tab-bar>
\ No newline at end of file

@@ -37,7 +37,6 @@ 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;

@@ -4,7 +4,7 @@
         "ignore": []
     },
     "setting": {
-        "urlCheck": true,
+        "urlCheck": false,
         "es6": true,
         "enhance": false,
         "postcss": true,
@@ -21,6 +21,7 @@
         "checkSiteMap": true,
         "uploadWithSourceMap": true,
         "compileHotReLoad": false,
+        "lazyloadPlaceholderEnable": false,
         "useMultiFrameRuntime": true,
         "useApiHook": true,
         "useApiHostProcess": true,
@@ -30,17 +31,18 @@
             "outputPath": ""
         },
         "enableEngineNative": false,
-        "bundle": false,
-        "useIsolateContext": true,
-        "useCompilerModule": true,
-        "userConfirmedUseCompilerModuleSwitch": false,
+        "useIsolateContext": false,
         "userConfirmedBundleSwitch": false,
         "packNpmManually": false,
         "packNpmRelationList": [],
-        "minifyWXSS": true
+        "minifyWXSS": true,
+        "disableUseStrict": false,
+        "minifyWXML": true,
+        "showES6CompileOption": false,
+        "useCompilerPlugins": false
     },
     "compileType": "miniprogram",
-    "libVersion": "2.14.3",
+    "libVersion": "2.19.6",
     "appid": "wx73497072e7340d61",
     "projectname": "binhaineigouopen",
     "debugOptions": {