1

app.json

@@ -1,5 +1,4 @@
 {
-<<<<<<< HEAD
     "pages": [
         "pages/index/index",
         "pages/home/index",
@@ -60,65 +59,5 @@
         "scope.userLocation": {
             "desc": "你的位置信息将用于小程序位置接口的效果展示"
         }
-=======
-  "pages": [
-    "pages/index/index",
-    "pages/home/index",
-    "pages/login/index",
-    "pages/login/agreement",
-    "pages/user/index",
-    "pages/user/detail",
-    "pages/test/index",
-    "pages/logs/logs"
-  ],
-  "usingComponents": {
-    "van-button": "/miniprogram_npm/@vant/weapp/button/index",
-    "van-row": "/miniprogram_npm/@vant/weapp/row/index",
-    "van-col": "/miniprogram_npm/@vant/weapp/col/index",
-    "van-datetime-picker": "/miniprogram_npm/@vant/weapp/datetime-picker/index",
-    "van-picker": "/miniprogram_npm/@vant/weapp/picker/index",
-    "van-popup": "/miniprogram_npm/@vant/weapp/popup/index",
-    "van-radio": "/miniprogram_npm/@vant/weapp/radio/index",
-    "van-radio-group": "/miniprogram_npm/@vant/weapp/radio-group/index",
-    "van-action-sheet": "/miniprogram_npm/@vant/weapp/action-sheet/index",
-    "van-search": "/miniprogram_npm/@vant/weapp/search/index",
-    "van-tree-select": "/miniprogram_npm/@vant/weapp/tree-select/index",
-    "van-overlay": "/miniprogram_npm/@vant/weapp/overlay/index",
-    "van-dialog": "/miniprogram_npm/@vant/weapp/dialog/index",
-    "van-tab": "/miniprogram_npm/@vant/weapp/tab/index",
-    "van-tabs": "/miniprogram_npm/@vant/weapp/tabs/index",
-    "van-stepper": "/miniprogram_npm/@vant/weapp/stepper/index",
-    "van-collapse": "/miniprogram_npm/@vant/weapp/collapse/index",
-    "van-collapse-item": "/miniprogram_npm/@vant/weapp/collapse-item/index",
-    "van-cell": "/miniprogram_npm/@vant/weapp/cell/index",
-    "van-cell-group": "/miniprogram_npm/@vant/weapp/cell-group/index",
-    "van-toast": "/miniprogram_npm/@vant/weapp/toast/index",
-    "van-field": "/miniprogram_npm/@vant/weapp/field/index",
-    "van-checkbox": "/miniprogram_npm/@vant/weapp/checkbox/index",
-    "van-checkbox-group": "/miniprogram_npm/@vant/weapp/checkbox-group/index",
-    "van-loading": "/miniprogram_npm/@vant/weapp/loading/index",
-    "van-icon": "/miniprogram_npm/@vant/weapp/icon/index",
-    "van-nav-bar": "/miniprogram_npm/@vant/weapp/nav-bar/index",
-    "van-tabbar": "/miniprogram_npm/@vant/weapp/tabbar/index",
-    "van-tabbar-item": "/miniprogram_npm/@vant/weapp/tabbar-item/index",
-    "van-rate": "/miniprogram_npm/@vant/weapp/rate/index",
-    "van-uploader": "@vant/weapp/uploader/index",
-    "van-divider": "/miniprogram_npm/@vant/weapp/divider/index"
-  },
-  "window": {
-    "backgroundTextStyle": "light",
-    "navigationBarBackgroundColor": "#fff",
-    "navigationBarTitleText": "耗材-小程序",
-    "navigationBarTextStyle": "black",
-    "navigationStyle": "custom"
-  },
-  "requiredBackgroundModes": [
-    "location"
-  ],
-  "sitemapLocation": "sitemap.json",
-  "permission": {
-    "scope.userLocation": {
-      "desc": "你的位置信息将用于小程序位置接口的效果展示"
->>>>>>> 1d862221a914395bd28e85461badf219385c8de4
     }
 }

pages/home/index.js

@@ -23,7 +23,6 @@ Page({
   // 跳转页面
   toPath: function (e) {
     const { data } = e.currentTarget.dataset;
-<<<<<<< HEAD
     // 绑定微信
     if (data.is_routine && data.is_routine == '1') {
       wx.showModal({
@@ -67,42 +66,6 @@ Page({
     } else {
       wx.navigateTo({ url: `/pages/${data.router}/index` })
     }
-=======
-    wx.navigateTo({ url: `/pages/${data.router}/index` })
-    // if (data.is_routine && data.is_routine == '1') {
-    //   wx.getStorage({
-    //     key: 'user',
-    //     success: res => {
-    //       if (res.data) {
-    //         const { openid } = app.globalData.wxInfo;
-    //         wx.request({
-    //           url: app.globalData.publicUrl + `/api/hc/user/update/${res.data.id}`,
-    //           method: "post",
-    //           data: { openid: openid },
-    //           header: {},
-    //           success: (res) => {
-    //             if (res.data.errcode == '0') {
-    //               wx.showToast({ title: `绑定微信成功`, icon: 'success', duration: 2000 })
-    //             } else {
-    //               wx.showToast({ title: `${res.data.errmsg}`, icon: 'error', duration: 2000 })
-    //             }
-    //           },
-    //         })
-    //       }
-    //     }
-    //   })
-    // } else if (data.is_routine && data.is_routine == '2') {
-    //   wx.clearStorage({
-    //     key: 'user',
-    //     success: res => {
-    //       wx.showToast({ title: `退出登录成功`, icon: 'success', duration: 2000 })
-    //       wx.redirectTo({ url: '/pages/login/index', })
-    //     }
-    //   })
-    // } else {
-    //   wx.navigateTo({ url: `/pages/${data.router}/index` })
-    // }
->>>>>>> 1d862221a914395bd28e85461badf219385c8de4
   },
   /**
    * 生命周期函数--监听页面加载