修改分包

app.json

@@ -1,4 +1,5 @@
 {
+  "navigationBarBackgroundColor":"#fff",
   "pages": [
     "pages/index/index",
     "pages/resource/index",
@@ -11,29 +12,20 @@
         "pages/login/index",
         "pages/register/index",
         "pages/xieyi/index",
-        "pages/zhengce/index"
-      ]
-    },
-    {
-      "root": "userResource",
-      "pages": [
-        "pages/resource-details/index",
-        "pages/resource-img/index"
+        "pages/zhengce/index",
+        "pages/about/index"
       ]
     },
     {
       "root": "userOrder",
       "pages": [
         "pages/continue/index",
-        "pages/order-details/index"
-      ]
-    },
-    {
-      "root": "userInfo",
-      "pages": [
-        "pages/about/index"
+        "pages/order-details/index",
+        "pages/resource-details/index",
+        "pages/resource-img/index"
       ]
     }
+    
   ],
   "window": {
     "backgroundTextStyle": "light",
@@ -77,29 +69,18 @@
   "usingComponents": {
     "popup-modal": "/components/popup-modal/index",
     "logout-show": "/components/logout-show/index",
-    "van-search": "@vant/weapp/search/index",
     "van-icon": "@vant/weapp/icon/index",
     "van-button": "@vant/weapp/button/index",
     "van-cell": "@vant/weapp/cell/index",
-    "van-tag": "@vant/weapp/tag/index",
     "van-field": "@vant/weapp/field/index",
-    "van-sidebar": "@vant/weapp/sidebar/index",
-    "van-sidebar-item": "@vant/weapp/sidebar-item/index",
     "van-empty": "@vant/weapp/empty/index",
-    "van-popup": "@vant/weapp/popup/index",
     "van-sticky": "@vant/weapp/sticky/index",
-    "van-calendar": "@vant/weapp/calendar/index",
     "van-image": "@vant/weapp/image/index",
     "van-tab": "@vant/weapp/tab/index",
     "van-tabs": "@vant/weapp/tabs/index",
-    "van-tabbar-item": "@vant/weapp/tabbar-item/index",
-    "van-datetime-picker": "@vant/weapp/datetime-picker/index",
     "van-row": "@vant/weapp/row/index",
     "van-col": "@vant/weapp/col/index",
     "van-nav-bar": "@vant/weapp/nav-bar/index",
-    "van-dropdown-menu": "@vant/weapp/dropdown-menu/index",
-    "van-dropdown-item": "@vant/weapp/dropdown-item/index",
-    "van-index-anchor": "@vant/weapp/index-anchor/index",
     "van-skeleton": "@vant/weapp/skeleton/index"
   },
   "requiredPrivateInfos": ["getLocation"],

app.wxss

@@ -21,29 +21,7 @@ body {
   min-height: 100vh;
 }
 
-page {
-  /* position: relative;
-  width: 100vh;
-  height: 100vh;
-  box-sizing: border-box;
-  margin:0;
-  padding:0; */
-}
 
-/* .van-popup--bottom{
-  z-index: 10000 !important;
-} */
-/* root-portal {
-  display: flex;
-  width: 100%;
-  height: 100%;
-}
-root-portal-content {
-  position: relative;
-  height: 100%;
-  width: 100%;
-  pointer-events: none;
-} */
 .popup-my {
   position: fixed !important;
   height: 100% !important;

components/city-bar/index.js

@@ -1,120 +0,0 @@
-const https = require("../../utils/serverData");
-const pinyin = require('js-pinyin');
-
-Component({
-  properties: {
-    changeValue: "",
-    changeLabel: ""
-  },
-  data: {
-    mapData: [],
-    loading: false,
-    indexList: [],
-    value: "",
-    label: "",
-    cityList: []
-  },
-
-  attached: async function () {
-    const {
-      changeValue,
-    } = this.data
-    this.setData({
-      loading: true
-    })
-
-    let mapData = await this.getAreaList()
-    this.setData({
-      mapData
-    })
-    mapData.map(item => {
-      item.pinyin = pinyin.getFullChars(item.label);
-    });
-
-    let provice = {};
-    mapData.map((item) => {
-      const Initials = item.pinyin[0].toUpperCase();
-      // 如果对象里有当前字母项则直接 push 一个对象,如果没有则创建一个新的键并赋值;     
-      if (provice[Initials]) {
-        provice[Initials].push(item);
-      } else {
-        provice[Initials] = [item];
-      }
-    });
-    // 将数据转为数组，并按字母顺利排列
-    let filterData = [];
-    for (let key in provice) {
-      const obj = {
-        letter: key,
-        list: provice[key]
-      };
-      filterData.push(obj)
-    }
-    filterData.sort((a, b) => {
-      return a.letter.localeCompare(b.letter)
-    });
-    // 为索引字符数组赋值
-    let indexList = [],
-      arr = [];
-    filterData.forEach((item) => {
-        indexList.push(item.letter)
-        let model = {
-          letter: item.letter,
-          list: []
-        }
-        item.list.forEach((si, sii) => {
-          const modelb = {
-            ...si,
-            order: Math.floor(item.list.length / 3) > Math.floor(sii / 3) ? false : true
-          }
-          model.list.push(modelb);
-        })
-        arr.push(model);
-      }
-
-    );
-    let name = "";
-    let index = mapData.findIndex((s) => String(s.id) === String(changeValue))
-    if (index !== -1) {
-      name = this.data.mapData[index].name
-    }
-    this.setData({
-      indexList: indexList,
-      cityList: arr,
-      value: String(changeValue),
-      label: name,
-      loading: false
-    })
-    console.log(changeValue,);
-    console.log(this.data.value);
-  },
-  methods: {
-    async getAreaList() {
-      const {
-        code,
-        data
-      } = await https.getArea({
-        level: 2
-      })
-      let arr = code === 1 ? data.list : [];
-      arr.map((s) => {
-        return s.value = s.id, s.label = s.name
-      })
-
-      return arr
-    },
-    bindViewTap(e) {
-      const {
-        pindex,
-        index
-      } = e.currentTarget.dataset
-      const model = {
-        value: this.data.cityList[pindex].list[index].value,
-        label: this.data.cityList[pindex].list[index].label,
-      }
-      this.setData(model)
-      console.log(model);
-      this.triggerEvent("itemClick", model)
-    },
-  }
-})

components/city-bar/index.json

@@ -1,6 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-index-bar": "@vant/weapp/index-bar/index"
-  }
-}

components/city-bar/index.scss

@@ -1,38 +0,0 @@
-.city-bar {
-  overflow: scroll;
-  height: 100vh;
-
-  .city-item {
-    background: #eee;
-
-    .city-value-row {
-      background: #fff;
-
-      &.current-city-value {
-        height: 50px;
-        line-height: 50px;
-        text-align: center;
-        color: #409EFF;
-      }
-    }
-
-    .city-value-item {
-
-      text-align: center;
-      height: 50px;
-      line-height: 50px;
-      border-bottom: 2px solid #eee;
-      overflow: hidden;
-      text-overflow: ellipsis;
-
-      &.not-border {
-        border: 2px solid transparent;
-      }
-
-      &.changed {
-        color: #409EFF;
-      }
-
-    }
-  }
-}

components/city-bar/index.wxml

@@ -1,26 +0,0 @@
-<view class="city-bar">
-  <view wx:if="{{loading==true}}">
-    <van-skeleton title row="3" />
-    <van-skeleton title row="3" />
-    <van-skeleton title row="3" />
-  </view>
-  <van-index-bar wx:else index-list="{{ indexList }}">
-    <view class="city-item current-city">
-      <van-index-anchor index="当前城市" />
-      <view class="city-value-row current-city-value">{{label}}</view>
-    </view>
-
-    <view class="city-item" wx:for="{{cityList}}" wx:key="index" data-type="{{item.id}}">
-      <van-index-anchor index="{{item.letter}}">{{item.letter}}</van-index-anchor>
-      <view class="city-value-row">
-        <van-row>
-          <van-col span="8" wx:for="{{item.list}}" wx:key="id" wx:for-index="idx" wx:for-item="small">
-            <view class="city-value-item {{ small.order?'not-border':''}} {{small.value===value?'changed':''}}" data-pindex="{{index}}" data-index="{{idx}}" bindtap="bindViewTap">
-              {{small.label}}
-            </view>
-          </van-col>
-        </van-row>
-      </view>
-    </view>
-  </van-index-bar>
-</view>

components/city-bar/index.wxss

@@ -1,36 +0,0 @@
-.city-bar {
-  overflow: scroll;
-  height: 100vh;
-}
-
-.city-bar .city-item {
-  background: #eee;
-}
-
-.city-bar .city-item .city-value-row {
-  background: #fff;
-}
-
-.city-bar .city-item .city-value-row.current-city-value {
-  height: 50px;
-  line-height: 50px;
-  text-align: center;
-  color: #409EFF;
-}
-
-.city-bar .city-item .city-value-item {
-  text-align: center;
-  height: 50px;
-  line-height: 50px;
-  border-bottom: 2px solid #eee;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.city-bar .city-item .city-value-item.not-border {
-  border: 2px solid transparent;
-}
-
-.city-bar .city-item .city-value-item.changed {
-  color: #409EFF;
-}

components/fuwuxieyi/index.js

@@ -1,78 +0,0 @@
-const App = getApp();
-
-Component({
-  options: {
-    addGlobalClass: true,
-  },
-  /**
-   * 组件的对外属性，是属性名到属性设置的映射表
-   */
-  properties: {
-    k: String,    
-  },
-
-  /**
-   * 组件的内部数据，和 properties 一同用于组件的模板渲染
-   */
-  data: {
-    s: false
-  },
-  // 组件数据字段监听器，用于监听 properties 和 data 的变化
-  observers: {
-
-  },
-  lifetimes: {
-    attached: function () {
-      if (!this.data.k) {
-        this.setData({
-          s: true
-        })
-        return
-      }
-      const agreeYxtk = wx.getStorageSync('agreeYxtk_' + this.data.k)
-      if (!agreeYxtk) {
-        this.setData({
-          s: true
-        })
-      }
-    },
-    detached: function () {
-      // 在组件实例被从页面节点树移除时执行
-    },
-  },
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-    aggree(){
-      if (this.data.k) {
-        wx.setStorageSync('agreeYxtk_' + this.data.k, true)
-      }
-      this.setData({
-        s: false
-      })
-    },
-    notagree(){
-      wx.navigateTo({
-        url: '/pages/notagree/index'
-      })
-    },
-    goYstk(e){
-      const k = e.currentTarget.dataset.k
-      wx.navigateTo({
-        url: '/pages/about/index?key=' + k,
-      })
-    },
-    navBack: function () {
-      wx.navigateBack({
-        delta: 1
-      })
-    },
-    //回主页
-    toIndex: function () {
-      wx.navigateTo({
-        url: '/pages/admin/home/index/index'
-      })
-    },
-  }
-})

components/fuwuxieyi/index.json

@@ -1,3 +0,0 @@
-{
-  "component": true
-}

components/fuwuxieyi/index.wxml

@@ -1,18 +0,0 @@
-<van-popup show="{{ s }}" custom-class="btn-add-box-popup" round close-on-click-overlay="{{ false }}">
-  <view class="t">用户协议及隐私政策</view>
-  <view class="content">
-    您在使用我们的服务时，我们可能会收集和
-    使用您的相关信息。我们希望通过本
-    <text class="link" data-k="yhxy" bindtap="goYstk">《用户协议》</text>
-    及<text class="link" data-k="ysxy" bindtap="goYstk">《隐私协议》</text>向您说明，在使用我
-    们的服务时，我们如何收集、使用、储存和
-    分享这些信息，以及我们为您提供的访问、
-    更新、控制和保护这些信息的方式。本<text class="link" data-k="yhxy" bindtap="goYstk">《用户协议》</text>及
-    <text class="link" data-k="ysxy" bindtap="goYstk">《隐私协议》</text>，希望您仔细闭读，
-    充分理解协议中的内容后再点击同意。
-  </view>
-  <view class="btn-group">
-    <van-button type="primary" block size="small" bind:click="aggree">同意</van-button>
-    <van-button type="danger" block size="small" bind:click="notagree">不同意</van-button>
-  </view>
-</van-popup>

components/fuwuxieyi/index.wxss

@@ -1,32 +0,0 @@
-.btn-add-box-popup .t {
-  font-size: 36rpx;
-  text-align: center;
-  height: 88rpx;
-  line-height: 88rpx;
-  font-weight: bold;
-}
-.btn-add-box-popup .bd {
-  padding: 0 32rpx;
-  padding-bottom: 32rpx;
-}
-.btn-add-box-popup .del-btn {
-  margin-top: 32rpx;
-}
-
-.content {
-	width: 600rpx;
-	padding: 32rpx;
-	font-size: 32rpx;
-	line-height: 54rpx;
-}
-.link {
-	color: #10AEFF;
-}
-.btn-group {
-  padding: 32rpx;
-  display: flex;
-  justify-content: space-around;
-}
-.mt32 {
-	margin-top: 32rpx;
-}

components/popup-modal/index.js

@@ -1,4 +1,5 @@
 const https = require("../../utils/serverData");
+const pinyin = require('js-pinyin');
 const dayjs = require("dayjs")
 import {
   storeBindingsBehavior
@@ -7,6 +8,7 @@ import {
   store
 } from "../../store/index";
 
+
 Component({
   behaviors: [storeBindingsBehavior],
   properties: {
@@ -22,6 +24,10 @@ Component({
     loading: false,
     value: "",
     label: "",
+
+    mapData: [],
+    indexList: [],
+    cityList: []
   },
   storeBindings: {
     store: store,
@@ -44,16 +50,21 @@ Component({
           popupType,
           popupValue
         } = this.data
-        if (popupType === "radio") {
+        console.log(popupValue);
+        if (popupType === "radio" || popupType === 'city') {
           this.setData({
-            value: popupValue
+            value: String(popupValue)
           })
         }
         if (popupType === 'checkbox' || popupType === "radio") {
           this.getDateList()
-        } else {
+        } else if (popupType === 'city') {
+          this.getMapAreaList()
+        } else if (popupType === 'time') {
+
           this.setData({
             popupOptions: [],
+            value: popupValue
           })
         }
 
@@ -62,6 +73,77 @@ Component({
     },
   },
   methods: {
+    async getMapAreaList() {
+      const {
+        popupValue,
+      } = this.data
+      this.setData({
+        loading: true
+      })
+
+      let mapData = await this.getAreaList()
+      this.setData({
+        mapData
+      })
+      mapData.map(item => {
+        item.pinyin = pinyin.getFullChars(item.label);
+      });
+
+      let provice = {};
+      mapData.map((item) => {
+        const Initials = item.pinyin[0].toUpperCase();
+        // 如果对象里有当前字母项则直接 push 一个对象,如果没有则创建一个新的键并赋值;     
+        if (provice[Initials]) {
+          provice[Initials].push(item);
+        } else {
+          provice[Initials] = [item];
+        }
+      });
+      // 将数据转为数组，并按字母顺利排列
+      let filterData = [];
+      for (let key in provice) {
+        const obj = {
+          letter: key,
+          list: provice[key]
+        };
+        filterData.push(obj)
+      }
+      filterData.sort((a, b) => {
+        return a.letter.localeCompare(b.letter)
+      });
+      // 为索引字符数组赋值
+      let indexList = [],
+        arr = [];
+      filterData.forEach((item) => {
+          indexList.push(item.letter)
+          let model = {
+            letter: item.letter,
+            list: []
+          }
+          item.list.forEach((si, sii) => {
+            const modelb = {
+              ...si,
+              order: Math.floor(item.list.length / 3) > Math.floor(sii / 3) ? false : true
+            }
+            model.list.push(modelb);
+          })
+          arr.push(model);
+        }
+
+      );
+      let name = "";
+      let index = mapData.findIndex((s) => String(s.id) === String(popupValue))
+      if (index !== -1) {
+        name = this.data.mapData[index].label
+      }
+      this.setData({
+        indexList: indexList,
+        cityList: arr,
+        value: popupValue,
+        label: name,
+        loading: false
+      })
+    },
     async getDateList() {
       let resList = []
       const {
@@ -119,7 +201,6 @@ Component({
       })
     },
     timeConfirm(e) {
-      // console.log(e.detail);
       let str = "",
         time1 = "",
         time2 = "",
@@ -145,6 +226,16 @@ Component({
       })
 
     },
+    bindViewTap(e) {
+      const {
+        pindex,
+        index
+      } = e.currentTarget.dataset
+      this.returnItem({
+        value: this.data.cityList[pindex].list[index].value,
+        label: this.data.cityList[pindex].list[index].label,
+      })
+    },
 
 
     //复选框确定
@@ -193,6 +284,31 @@ Component({
       }
       this.triggerEvent("itemClick", modal)
     },
+    async getAreaList() {
+      const {
+        code,
+        data
+      } = await https.getArea({
+        level: 2
+      })
+      let arr = code === 1 ? data.list : [];
+      arr.map((s) => {
+        return s.value = s.id, s.label = s.name
+      })
+      arr.push({
+        name: "天津",
+        id: 3,
+        value: 3,
+        label: '天津'
+      })
+      arr.push({
+        name: "内蒙古自治区",
+        id: 4,
+        value: 4,
+        label: '内蒙古自治区'
+      })
+      return arr
+    },
     showToastMsg(msg) {
       wx.showToast({
         title: msg,

components/popup-modal/index.json

@@ -1,6 +1,9 @@
 {
   "component": true,
   "usingComponents": {
-    "city-bar": "/components/city-bar/index"
+    "van-index-anchor": "@vant/weapp/index-anchor/index",
+    "van-index-bar": "@vant/weapp/index-bar/index",
+    "van-calendar": "@vant/weapp/calendar/index",
+    "van-popup": "@vant/weapp/popup/index"
   }
 }

components/popup-modal/index.scss

@@ -1,8 +1,9 @@
 .popup-container {
   height: 100vh;
-  padding:66px  0 0 0;
+  padding: 66px 0 0 0;
   box-sizing: border-box;
-  overflow-y: scroll;
+  overflow: hidden;
+  // overflow-y: scroll;
 
   .popup-radio {
     padding: 10px 0 10px 0;
@@ -23,56 +24,83 @@
   }
 
   .popup-checkbox {
-    padding: 0 16px 0 16px;
     box-sizing: border-box;
     position: relative;
-    height: 100%;
-    min-height:100% ;
+    height: calc(100vh - 66px);
+    min-height: calc(100vh - 66px);
     overflow: hidden;
+    padding: 0;
 
-    .msgTitle {
+    .popup-checkbox-header {
       background: #67C23A;
       font-size: 12px;
       text-align: center;
       height: 30px;
       line-height: 26px;
       color: #fff;
-      margin: 0 -16px 20px -16px;
+      margin: 0;
+      position: absolute;
+      width: 100%;
+      top: 0;
+      left: 0;
+      z-index: 9999;
     }
 
-    .popup-checkbox-item {
-      color: #000;
-      font-size: 16px;
-      font-weight: bold;
-      line-height: 50px;
-      background: rgb(244, 244, 245);
-      padding: 6px 12px;
-      margin: 0 0 10px 0;
-      border-radius: 7px;
-      border: 1px solid rgb(244, 244, 245);
-      display: flex;
+    .popup-checkbox-main {
+      padding: 42px 16px 100px 16px;
+      overflow: scroll;
+      box-sizing: border-box;
+      height: 100%;
 
-      &.selected {
-        color: #409EFF;
-        border: 1px solid #409EFF;
-      }
+      .popup-checkbox-item {
+        color: #000;
+        font-size: 16px;
+        font-weight: bold;
+        line-height: 42px;
+        background: rgb(244, 244, 245);
+        padding: 6px 12px;
+        margin: 0 0 10px 0;
+        border-radius: 7px;
+        border: 1px solid rgb(244, 244, 245);
+        display: flex;
 
-      .popup-checkbox-label {
-        flex: 5;
-      }
+        &.selected {
+          color: #409EFF;
+          border: 1px solid #409EFF;
+        }
 
-      .popup-checkbox-icon {
-        width: 20px;
-        height: 20px;
-        line-height: 20px;
-        display: block;
-        border-radius: 50%;
-        overflow: hidden;
-        margin: 15px 0 0 0;
+        .popup-checkbox-label {
+          flex: 5;
+        }
 
+        .popup-checkbox-icon {
+          width: 20px;
+          height: 20px;
+          line-height: 20px;
+          display: block;
+          border-radius: 50%;
+          overflow: hidden;
+          margin: 11px 0 0 0;
+
+        }
       }
     }
 
+    .popup-checkbox-footer {
+      position: absolute;
+      z-index: 9999;
+      left: 0;
+      bottom: 0;
+      height: 66px;
+      width: 100%;
+      padding: 5px 16px;
+      box-sizing: border-box;
+      background: #fff;
+      border-top: 1px solid #f0f0f0;
+      box-shadow: 0 0 5px rgba(0, 0, 0, 0.15);
+    }
+
+
   }
 
   .popup-time {
@@ -82,7 +110,43 @@
 
   .popup-city {
     height: calc(100vh - 66px);
-    overflow: hidden;
+    overflow: scroll;
+
+    .city-item {
+      background: #eee;
+
+      .city-value-row {
+        background: #fff;
+
+        &.current-city-value {
+          height: 50px;
+          line-height: 50px;
+          text-align: center;
+          color: #409EFF;
+        }
+      }
+
+      .city-value-item {
+
+        text-align: center;
+        height: 50px;
+        line-height: 50px;
+        border-bottom: 2px solid #eee;
+        overflow: hidden;
+        text-overflow: ellipsis;
+
+        &.not-border {
+          border: 2px solid transparent;
+        }
+
+        &.changed {
+          color: #409EFF;
+        }
+
+      }
+    }
+
+
   }
 
 }

components/popup-modal/index.wxml

@@ -1,31 +1,57 @@
-<van-popup custom-class="aaa" show="{{ show }}" close-on-click-overlay="{{false}}" get-container="#app" bind:close="onClose" position="right" custom-style="width: 100%;height: 100%" safe-area-tab-bar="{{false}}" safe-area-inset-bottom="{{false}}" z-index="99999" >
-<van-sticky>
-  <van-nav-bar title="{{popupTitle}}" left-arrow bind:click-left="onClickLeft" />
-</van-sticky>
-<logout-show title="{{ popupTitle}}" showBtn="{{false}}" wx:if="{{ token==='' }}" />
+<van-popup custom-class="aaa" show="{{ show }}" close-on-click-overlay="{{false}}" get-container="#app" bind:close="onClose" position="right" custom-style="width: 100%;height: 100%" safe-area-tab-bar="{{false}}" safe-area-inset-bottom="{{false}}" z-index="99999">
+  <van-sticky>
+    <van-nav-bar title="{{popupTitle}}" left-arrow bind:click-left="onClickLeft" />
+  </van-sticky>
+  <logout-show title="{{ popupTitle}}" showBtn="{{false}}" wx:if="{{ token==='' }}" />
   <view class="popup-container" wx:else>
     <view class="popup-radio" wx:if="{{popupType=='radio'}}">
       <view class="popup-radio-item {{value===item.id?'selected':''}}" wx:for="{{ popupOptions}}" wx:key="index" bindtap="radioChange" data-index="{{index}}">{{item.name}}</view>
     </view>
     <view class="popup-time" wx:elif="{{popupType=='time'}}">
-      <van-calendar show-title="{{false}}" show-subtitle="{{false}}" color="#409EFF" round="{{false}}" type="range" poppable="{{ false }}" close-on-click-overlay="{{false}}" safe-area-inset-bottom="{{false}}" max-range="{{15}}" allow-same-day="{{true}}" bind:confirm="timeConfirm" />
+      <van-calendar show-title="{{false}}" show-subtitle="{{false}}" color="#409EFF" round="{{false}}" type="range" poppable="{{ false }}" close-on-click-overlay="{{false}}" default-date="{{value}}" safe-area-inset-bottom="{{false}}" max-range="{{15}}" allow-same-day="{{true}}" bind:confirm="timeConfirm" />
     </view>
     <view class="popup-checkbox" wx:elif="{{popupType=='checkbox'}}">
-      <view class="msgTitle">温馨提示：{{ popupTitle}}可多选</view>
-      <view class="popup-checkbox-item {{item.selected?'selected':''}}" wx:for="{{ popupOptions}}" wx:key="index" bindtap="checkboxChange" data-index="{{index}}">
-        <view class="popup-checkbox-label">
-          {{item.name}}
-        </view>
-        <view class="popup-checkbox-icon">
-          <van-icon wx:if="{{item.selected}}" name="checked" size="20px" color="#409EFF" custom-style="background:#fff" />
-          <van-icon wx:else name="circle" color="#909399" size="20px" custom-style="background:#fff" />
+      <view class="popup-checkbox-header">
+        温馨提示：{{ popupTitle}}可多选</view>
+      <view class="popup-checkbox-main">
+        <view class="popup-checkbox-item {{item.selected?'selected':''}}" wx:for="{{ popupOptions}}" wx:key="index" bindtap="checkboxChange" data-index="{{index}}">
+          <view class="popup-checkbox-label">
+            {{item.name}}
+          </view>
+          <view class="popup-checkbox-icon">
+            <van-icon wx:if="{{item.selected}}" name="checked" size="20px" color="#409EFF" custom-style="background:#fff" />
+            <van-icon wx:else name="circle" color="#909399" size="20px" custom-style="background:#fff" />
+          </view>
         </view>
       </view>
-      <van-button type="info" custom-style="width:100%;margin:8px  0 0 0" bindtap="checkboxSelected">确定</van-button>
-
+      <view class="popup-checkbox-footer">
+        <van-button type="info" custom-style="width:100%;margin:8px  0 0 0" bindtap="checkboxSelected">确定</van-button>
+      </view>
     </view>
     <view class="popup-city" wx:elif="{{popupType=='city'}}">
-      <city-bar changeValue="{{popupValue}}" changeLabel="{{'北京'}}" binditemClick="onItemClick" />
+      <van-index-bar index-list="{{ indexList }}">
+        <view class="city-item current-city">
+          <van-index-anchor index="当前城市" />
+          <view class="city-value-row current-city-value">{{label}}</view>
+        </view>
+
+        <view class="city-item" wx:for="{{cityList}}" wx:key="index" data-type="{{item.id}}">
+          <van-index-anchor index="{{item.letter}}">{{item.letter}}</van-index-anchor>
+          <view class="city-value-row">
+            <van-row>
+              <van-col span="8" wx:for="{{item.list}}" wx:key="id" wx:for-index="idx" wx:for-item="small">
+                <view class="city-value-item {{ small.order?'not-border':''}} {{small.value===value?'changed':''}}" data-pindex="{{index}}" data-index="{{idx}}" bindtap="bindViewTap">
+                  {{small.label}}
+                </view>
+              </van-col>
+            </van-row>
+          </view>
+        </view>
+      </van-index-bar>
+      <!-- <city-bar changeValue="{{popupValue}}" changeLabel="{{'北京'}}" binditemClick="onItemClick" /> -->
+
+
+
 
     </view>
 

components/popup-modal/index.wxss

@@ -1,8 +1,8 @@
 .popup-container {
   height: 100vh;
-  padding: 66px  0 0 0;
+  padding: 66px 0 0 0;
   box-sizing: border-box;
-  overflow-y: scroll;
+  overflow: hidden;
 }
 
 .popup-container .popup-radio {
@@ -22,29 +22,41 @@
 }
 
 .popup-container .popup-checkbox {
-  padding: 0 16px 0 16px;
   box-sizing: border-box;
   position: relative;
-  height: 100%;
-  min-height: 100%;
+  height: calc(100vh - 66px);
+  min-height: calc(100vh - 66px);
   overflow: hidden;
+  padding: 0;
 }
 
-.popup-container .popup-checkbox .msgTitle {
+.popup-container .popup-checkbox .popup-checkbox-header {
   background: #67C23A;
   font-size: 12px;
   text-align: center;
   height: 30px;
   line-height: 26px;
   color: #fff;
-  margin: 0 -16px 20px -16px;
+  margin: 0;
+  position: absolute;
+  width: 100%;
+  top: 0;
+  left: 0;
+  z-index: 9999;
+}
+
+.popup-container .popup-checkbox .popup-checkbox-main {
+  padding: 42px 16px 100px 16px;
+  overflow: scroll;
+  box-sizing: border-box;
+  height: 100%;
 }
 
-.popup-container .popup-checkbox .popup-checkbox-item {
+.popup-container .popup-checkbox .popup-checkbox-main .popup-checkbox-item {
   color: #000;
   font-size: 16px;
   font-weight: bold;
-  line-height: 50px;
+  line-height: 42px;
   background: #f4f4f5;
   padding: 6px 12px;
   margin: 0 0 10px 0;
@@ -53,23 +65,37 @@
   display: flex;
 }
 
-.popup-container .popup-checkbox .popup-checkbox-item.selected {
+.popup-container .popup-checkbox .popup-checkbox-main .popup-checkbox-item.selected {
   color: #409EFF;
   border: 1px solid #409EFF;
 }
 
-.popup-container .popup-checkbox .popup-checkbox-item .popup-checkbox-label {
+.popup-container .popup-checkbox .popup-checkbox-main .popup-checkbox-item .popup-checkbox-label {
   flex: 5;
 }
 
-.popup-container .popup-checkbox .popup-checkbox-item .popup-checkbox-icon {
+.popup-container .popup-checkbox .popup-checkbox-main .popup-checkbox-item .popup-checkbox-icon {
   width: 20px;
   height: 20px;
   line-height: 20px;
   display: block;
   border-radius: 50%;
   overflow: hidden;
-  margin: 15px 0 0 0;
+  margin: 11px 0 0 0;
+}
+
+.popup-container .popup-checkbox .popup-checkbox-footer {
+  position: absolute;
+  z-index: 9999;
+  left: 0;
+  bottom: 0;
+  height: 66px;
+  width: 100%;
+  padding: 5px 16px;
+  box-sizing: border-box;
+  background: #fff;
+  border-top: 1px solid #f0f0f0;
+  box-shadow: 0 0 5px rgba(0, 0, 0, 0.15);
 }
 
 .popup-container .popup-time {
@@ -79,5 +105,37 @@
 
 .popup-container .popup-city {
   height: calc(100vh - 66px);
+  overflow: scroll;
+}
+
+.popup-container .popup-city .city-item {
+  background: #eee;
+}
+
+.popup-container .popup-city .city-item .city-value-row {
+  background: #fff;
+}
+
+.popup-container .popup-city .city-item .city-value-row.current-city-value {
+  height: 50px;
+  line-height: 50px;
+  text-align: center;
+  color: #409EFF;
+}
+
+.popup-container .popup-city .city-item .city-value-item {
+  text-align: center;
+  height: 50px;
+  line-height: 50px;
+  border-bottom: 2px solid #eee;
   overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.popup-container .popup-city .city-item .city-value-item.not-border {
+  border: 2px solid transparent;
+}
+
+.popup-container .popup-city .city-item .city-value-item.changed {
+  color: #409EFF;
 }

pages/index/columns.js

@@ -39,7 +39,7 @@
   }
 }
 const formData= {
-  city: 2,
+  city: "2",
   city_name: "北京市",
   phone: "",
   act_time_start: "",

pages/index/index.js

@@ -133,16 +133,7 @@ Page({
       loading: false
     })
   },
-  async orderAdd(model) {
 
-
-    return {
-      code,
-      reqCode: data.reqCode,
-      msg
-    }
-
-  },
   valKey() {
     let msg = ""
     const {
@@ -185,9 +176,14 @@ Page({
       this.showToastMsg("请先登录！")
       return
     }
+    const {
+      act_time_start,
+      act_time_end
+    } = this.data.formData
+    console.log(this.data.formData)
     this.setData({
-      popupValue: this.data.formData[key],
-      popupType: this.data.config[key].type,
+      popupValue: type !== 'time' ? this.data.formData[key] : act_time_start ? [act_time_start, act_time_end] : [],
+      popupType: type,
       popupTitle: this.data.config[key].title,
       popupApi: this.data.config[key].api,
       popupKey: key,
@@ -201,7 +197,8 @@ Page({
       popupKey,
       popupType,
       value,
-      count
+      count,
+      end
     } = e.detail
     // console.log(e);
     let form = {
@@ -210,8 +207,10 @@ Page({
     form[popupKey] = value
     form[popupKey + '_name'] = label
     if (popupType === 'time') {
-      form.act_day_count = count
-    }
+      form.act_day_count = count;
+      form.act_time_start = value;
+      form.act_time_end = end
+    } 
     this.setData({
       show: false,
       formData: form
@@ -230,10 +229,6 @@ Page({
       duration: 2000
     })
   },
-  onClickLeft() {
-    this.setData({
-      show: false
-    });
-  },
+
 
 })

pages/index/index.json

@@ -1,3 +1,4 @@
 {
-  "navigationStyle": "custom"
+  "navigationStyle": "custom",
+  "navigationBarBackgroundColor":"#fff"
 }

pages/my/index.json

@@ -1,3 +1,4 @@
 {
+  "navigationBarBackgroundColor":"#fff",
     "navigationBarTitleText":"我的"
 }

pages/order/index.js

@@ -27,7 +27,7 @@ Page({
       fields: ["token"],
       actions: ["setStore"],
     });
-    this.orderList();
+   
   },
   onUnload() {
     this.storeBindings.destroyStoreBindings();
@@ -39,6 +39,7 @@ Page({
         selected: 2
       })
     }
+    this.orderList();
   },
   aa(e) {
     console.log('阻止事件冒泡！');

pages/order/index.json

@@ -1,2 +1,4 @@
 {
-    "navigationBarTitleText":"我的订单"}
+  "navigationBarBackgroundColor":"#fff",
+    "navigationBarTitleText":"我的订单"
+  }

pages/resource/columns.js

@@ -29,7 +29,7 @@ const config = {
 const formData = {
   store_name: "", //店铺名称
   store_city: "2",
-  store_city_name: '北京',
+  store_city_name: '北京市',
   type_id: "0",
   type_id_title: "",
   area_id: "0",

pages/resource/index.js

@@ -38,8 +38,8 @@ Page({
       fields: ["token"],
       actions: ["setStore"],
     });
-    this.getResourceList()
-    this.getListAll()
+
+
   },
   onUnload() {
     this.storeBindings.destroyStoreBindings();
@@ -51,6 +51,8 @@ Page({
         selected: 1
       })
     }
+    this.getResourceList()
+    this.getListAll()
   },
   async getListAll() {
     const list1 = await this.getDateList('type_id');
@@ -148,7 +150,7 @@ Page({
     const type = e.currentTarget.dataset.type;
     // console.log(type);
     wx.navigateTo({
-      url: '../../userResource/pages/resource-details/index?id=' + type
+      url: '../../userOrder/pages/resource-details/index?id=' + type
     })
   },
   onSearch(e) {
@@ -170,8 +172,12 @@ Page({
   },
 
   aaa() {
+    const {
+      formData
+    } = this.data
     this.setData({
-      show: true
+      show: true,
+      popupValue: formData.store_city
     })
     // console.log('aaa');
   },
@@ -180,8 +186,23 @@ Page({
       show: false,
     });
   },
-  onConfirm() {
-    this.selectComponent('#item').toggle();
+
+  tapItemClick(e) {
+    const {
+      label,
+      value,
+    } = e.detail
+    console.log(e);
+    let form = {
+      ...this.data.formData,
+      store_city: value,
+      store_city_name: label,
+    }
+
+    this.setData({
+      show: false,
+      formData: form
+    });
   },
   async getResourceList() {
     const {
@@ -197,7 +218,7 @@ Page({
       this.setData({
         formData: {
           ...formData,
-          page: page-1
+          page: page - 1
         }
       })
       return

pages/resource/index.json

@@ -1,3 +1,10 @@
 {
-  "navigationStyle": "custom"
+  "navigationBarBackgroundColor": "#fff",
+  "navigationStyle": "custom",
+  "usingComponents": {
+    "van-search": "@vant/weapp/search/index",
+    "van-dropdown-menu": "@vant/weapp/dropdown-menu/index",
+    "van-dropdown-item": "@vant/weapp/dropdown-item/index"
+  }
+
 }

project.config.json

@@ -27,7 +27,7 @@
     "useApiHook": true,
     "useApiHostProcess": true,
     "showShadowRootInWxmlPanel": true,
-    "packNpmManually": false,
+    "packNpmManually": true,
     "enableEngineNative": false,
     "packNpmRelationList": [
       {
@@ -43,7 +43,7 @@
       "disablePlugins": [],
       "outputPath": ""
     },
-    "condition": false,
+    "condition": true,
     "ignoreDevUnusedFiles": false,
     "ignoreUploadUnusedFiles": false
   },

project.private.config.json

@@ -3,7 +3,8 @@
   "projectname": "sunshine-meet",
   "setting": {
     "compileHotReLoad": true,
-    "urlCheck": false
+    "urlCheck": false,
+    "preloadBackgroundData": false
   },
   "libVersion": "2.31.1"
 }

userInfo/pages/about/index.json → userLogin/pages/about/index.json

@@ -1,3 +1,4 @@
 {
+  "navigationBarBackgroundColor":"#fff",
   "navigationBarTitleText": "关于我们"
 }

userLogin/pages/login/index.json

@@ -1,3 +1,4 @@
 {
-    "navigationBarTitleText":"登录"
+  "navigationBarBackgroundColor": "#fff",
+  "navigationBarTitleText": "登录"
 }

userLogin/pages/register/index.json

@@ -1,3 +1,4 @@
 {
-    "navigationBarTitleText":"注册"
+  "navigationBarBackgroundColor": "#fff",
+  "navigationBarTitleText": "注册"
 }

userLogin/pages/xieyi/index.json

@@ -1,3 +1,4 @@
 {
-    "navigationBarTitleText":"用户协议"
+  "navigationBarBackgroundColor": "#fff",
+  "navigationBarTitleText": "用户协议"
 }

userLogin/pages/zhengce/index.json

@@ -1,3 +1,4 @@
 {
-    "navigationBarTitleText":"隐私政策"
+  "navigationBarBackgroundColor": "#fff",
+  "navigationBarTitleText": "隐私政策"
 }

userOrder/pages/continue/columns.js

@@ -39,7 +39,7 @@ const config = {
   }
 }
 const formData= {
-  city: 2,
+  city: "2",
   city_name: "北京市",
   phone: "",
   act_time_start: "",

userOrder/pages/continue/index.js

@@ -22,12 +22,7 @@ Page({
     },
     popupValue: '',
     show: false,
-    background: [
-      'https://fastly.jsdelivr.net/npm/@vant/assets/apple-1.jpeg',
-      'https://fastly.jsdelivr.net/npm/@vant/assets/apple-2.jpeg',
-      'https://fastly.jsdelivr.net/npm/@vant/assets/apple-1.jpeg',
-      'https://fastly.jsdelivr.net/npm/@vant/assets/apple-2.jpeg',
-    ],
+
     indicatorDots: true,
     vertical: false,
     autoplay: true,
@@ -46,6 +41,12 @@ Page({
   onUnload() {
     this.storeBindings.destroyStoreBindings();
   },
+  onClickLeft() {
+    wx.navigateBack({
+      data: 1
+    })
+
+  },
   async submitTap() {
     const token = this.data.token ?? ""
     if (token === '') {
@@ -164,7 +165,7 @@ Page({
 
   onPhoneChange(event) {
     this.setData({
-      phone:event.detail.value
+      phone: event.detail.value
     })
   },
   //输入组件 只读点击选择数据
@@ -178,12 +179,14 @@ Page({
       })
       return
     }
-    console.log(key);
-    console.log(this.data.formData[key]);
-    console.log(this.data.config[key]);
+    const {
+      act_time_start,
+      act_time_end
+    } = this.data.formData
+
     this.setData({
-      popupValue: this.data.formData[key],
-      popupType: this.data.config[key].type,
+      popupValue: type !== 'time' ? this.data.formData[key] : act_time_start ? [act_time_start, act_time_end] : [],
+      popupType: type,
       popupTitle: this.data.config[key].title,
       popupApi: this.data.config[key].api,
       popupKey: key,
@@ -197,7 +200,8 @@ Page({
       popupKey,
       popupType,
       value,
-      count
+      count,
+      end
     } = e.detail
     // console.log(e);
     let form = {
@@ -206,7 +210,9 @@ Page({
     form[popupKey] = value
     form[popupKey + '_name'] = label
     if (popupType === 'time') {
-      form.act_day_count = count
+      form.act_day_count = count;
+      form.act_time_start = value;
+      form.act_time_end = end
     }
     this.setData({
       show: false,

userOrder/pages/continue/index.json

@@ -1,3 +1,4 @@
 {
-  "navigationBarTitleText":"找我办会"
+  "navigationBarBackgroundColor": "#fff",
+  "navigationStyle": "custom"
 }

userOrder/pages/continue/index.wxml

@@ -1,4 +1,10 @@
 <view class="continue">
+  <van-sticky>
+    <van-nav-bar>
+      <van-icon name="arrow-left" slot="left" color="#323233" size="22px" bindtap="onClickLeft" custom-style="margin:0 0 0 -12px;font-weight: 600"/>
+      <view slot="title" style="font-size: 13px;color: #000;">找我办会</view>
+    </van-nav-bar>
+  </van-sticky>
   <view class="form-index">
     <van-field label="活动城市" readonly="{{ true }}" is-link value="{{ formData.city_name }}" placeholder="活动城市" bindtap="onFormChange" data-type="city" input-align="right" left-icon="location" />
 
@@ -21,4 +27,4 @@
     </view>
   </view>
 </view>
-<popup-modal show="{{show}}" popupType="{{popupType}}" popupKey="{{popupKey}}"  popupTitle="{{popupTitle}}" popupValue="{{popupValue}}" popupApi="{{popupApi}}" binditemClick="tapItemClick" bindleftClick="popupLeft"/>
+<popup-modal show="{{show}}" popupType="{{popupType}}" popupKey="{{popupKey}}" popupTitle="{{popupTitle}}" popupValue="{{popupValue}}" popupApi="{{popupApi}}" binditemClick="tapItemClick" bindleftClick="popupLeft" />

userOrder/pages/order-details/index.json

@@ -1,3 +1,4 @@
 {
-    "navigationBarTitleText":"阳关会务"
+  "navigationBarBackgroundColor": "#fff",
+  "navigationBarTitleText": "阳关会务"
 }

userOrder/pages/resource-details/index.json

@@ -0,0 +1,8 @@
+{
+  "navigationBarBackgroundColor": "#fff",
+  "navigationBarTitleText": "阳关会务",
+  "usingComponents": {
+    "van-tag": "@vant/weapp/tag/index"
+  }
+
+}

userResource/pages/resource-details/index.scss → userOrder/pages/resource-details/index.scss

@@ -51,7 +51,7 @@
 
   .title-box-point {
     .aa {
-      margin-left: 6px;
+      margin: 0 5px 5px 0;
     }
 
 
@@ -138,6 +138,9 @@
     // margin: 8px 0 0 0;
     padding: 10px 0;
     min-height: 400px;
+    &.cengban{
+      min-height: 0px;
+    }
 
     .huiyi-main {
       padding: 0 16px;

userResource/pages/resource-details/index.wxml → userOrder/pages/resource-details/index.wxml

@@ -16,12 +16,12 @@
         </view>
       </view>
       <view class="title-box-point">
-        <van-tag plain wx:for="{{items.store_spec_name}}" wx:key="index" size="large" class="{{index!==0?'aa':''}}">{{item}}</van-tag>
+        <van-tag plain wx:for="{{items.store_spec_name}}" wx:key="index" size="large" custom-class="aa">{{item}}</van-tag>
       </view>
     </view>
     <!--  -->
     <!-- bindtap="bindAddrTap" -->
-    <van-cell title="{{items.addr}}" is-link icon="location" >
+    <van-cell title="{{items.addr}}" is-link icon="location">
     </van-cell>
     <view class="title-label-box" wx:if="{{showNum}}">
       <van-row>
@@ -54,12 +54,16 @@
           </view>
         </van-col>
       </van-row>
-    <view style="padding:16px 0 0 0;margin:0 0 -5px 0">
-      <van-row>
-            <van-col span="12"><view style="text-align: center;font-size: 14px;">最近装修：{{items.renovation_date}}</view> </van-col>
-            <van-col span="12"><view style="text-align: center;font-size: 14px;">停车位数：{{items.park_num===0?'-':items.park_num}}个</view></van-col>
-          </van-row>
-        </view>
+      <view style="padding:16px 0 0 0;margin:0 0 -5px 0">
+        <van-row>
+          <van-col span="12">
+            <view style="text-align: center;font-size: 14px;">最近装修：{{items.renovation_date}}</view>
+          </van-col>
+          <van-col span="12">
+            <view style="text-align: center;font-size: 14px;">停车位数：{{items.park_num===0?'-':items.park_num}}个</view>
+          </van-col>
+        </van-row>
+      </view>
     </view>
 
   </view>
@@ -182,7 +186,7 @@
         </view>
       </van-tab>
       <van-tab title="酒店详情" name="5" title-style="font-size:15px;font-weight: bold;">
-        <view class="sheshi" wx:if="{{length>5&&showSS}}">
+        <view class="sheshi cengban" wx:if="{{length>5&&showSS}}">
 
           <view class="sheshi-main">
             <view class="jd" wx:if="{{joptions.length>0}}">
@@ -233,7 +237,7 @@
         </view>
         <view class="detail">
           <view class="detail-main">
-          
+
             {{items.store_desc}}
           </view>
         </view>

userResource/pages/resource-details/index.wxss → userOrder/pages/resource-details/index.wxss

@@ -46,7 +46,7 @@
 }
 
 .resource-details .title-box-point .aa {
-  margin-left: 6px;
+  margin: 0 5px 5px 0;
 }
 
 .resource-details .title-label-box {
@@ -121,6 +121,13 @@
   min-height: 400px;
 }
 
+.resource-details .huiyi.cengban,
+.resource-details .kefang.cengban,
+.resource-details .canting.cengban,
+.resource-details .sheshi.cengban {
+  min-height: 0px;
+}
+
 .resource-details .huiyi .huiyi-main,
 .resource-details .kefang .huiyi-main,
 .resource-details .canting .huiyi-main,

userOrder/pages/resource-img/index.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarBackgroundColor": "#fff",
+  "navigationBarTitleText": "阳关会务"
+}

userResource/pages/resource-details/columns.js

@@ -1,85 +0,0 @@
-const deatils_img = [{
-    id: '1',
-    title: '酒店1',
-    img: "https://fastly.jsdelivr.net/npm/@vant/assets/apple-1.jpeg"
-  },
-  {
-    id: '2',
-    title: '酒店2',
-    img: "https://fastly.jsdelivr.net/npm/@vant/assets/apple-2.jpeg"
-  }
-]
-
-const formData = {
-  value0: "酒店",
-  value1: "酒店",
-  value2: "酒店",
-  value3: "酒店",
-  value4: "酒店",
-}
-const searchLetter = ["A", "B", "C", "D", "E", "F", "G", "H", "J", "K", "L", "M", "N", "P", "Q", "R", "S", "T", "W", "X", "Y", "Z"];
-const value1_option = [{
-    text: '中式院落',
-    value: 0
-  },
-  {
-    text: '无柱',
-    value: 1
-  }
-]
-const value2_option = [{
-    text: '不限',
-    value: 0
-  },
-  {
-    text: '五星酒店',
-    value: 1
-  },
-  {
-    text: '四星酒店',
-    value: 2
-  },
-  {
-    text: '三星酒店',
-    value: 3
-  },
-]
-const value3_option = [{
-    text: '不限',
-    value: 0
-  },
-  {
-    text: '10-30人',
-    value: 1
-  },
-  {
-    text: '30-60人',
-    value: 2
-  },
-  {
-    text: '60+',
-    value: 3
-  },
-]
-const value4_option = [{
-    text: '不限',
-    value: 0
-  },
-  {
-    text: '无柱',
-    value: 1
-  },
-  {
-    text: '场地方正',
-    value: 2
-  },
-]
-export {
-  deatils_img,
-  formData,
-  searchLetter,
-  value1_option,
-  value2_option,
-  value3_option,
-  value4_option
-}

userResource/pages/resource-details/index.json

@@ -1,3 +0,0 @@
-{
-    "navigationBarTitleText":"阳关会务"
-}

userResource/pages/resource-img/index.json

@@ -1,3 +0,0 @@
-{
-    "navigationBarTitleText":"阳关会务"
-}

utils/http.js

@@ -1,4 +1,4 @@
-const apiUrl = "http://hwpro.test241.wanyuhengtong.com/"; // 公共的请求地址
+const apiUrl = "http://hwdev.test241.wanyuhengtong.com/"; // 公共的请求地址
 // http://hw.test241.wanyuhengtong.com
 
 // 封装微信请求方法