From 7da26a9bfecbad9ebb8afbf7ac1aa6f72146fff8 Mon Sep 17 00:00:00 2001
From: xiaohei <1494046114@qq.com>
Date: Wed, 8 Nov 2023 00:14:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=A4=BE=E5=8C=BA/?=
 =?UTF-8?q?=E6=9D=91=E3=80=81util.map.js=20=E5=9C=B0=E5=9D=80=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/env.js                             | 52 +++++++++----------
 src/main.ts                                   |  4 +-
 .../pages/masses-create/masses-create.vue     | 39 ++++++++++----
 .../pages/mediate-create/mediate-create.vue   | 24 ++++++++-
 src/pages/people/people.vue                   |  5 +-
 src/utils/util.map.js                         | 20 +++----
 vite.config.ts                                | 11 ++++
 7 files changed, 102 insertions(+), 53 deletions(-)

diff --git a/src/config/env.js b/src/config/env.js
index bebb3d3..830e569 100644
--- a/src/config/env.js
+++ b/src/config/env.js
@@ -2,33 +2,33 @@
  * @name 小程序环境
  * @description 多环境配置
  */
-const envName = 'development';
+const envName = 'production';
 const envs = [{
-    envName: 'production',
-    appID: 'wx736395182f05a1b7',
-    appName: '介休网格通',
-    version: '1.0.0',
-    baseUrl: 'https://jxwgtjm.xuqidata.com:8088',
-    fileUrl: 'https://jiexiu.xuqidata.com:8083/jiexiujumin',
-    loginPath: '/admin-api/system/auth/wechat/app/login',
-    aMapKey: '29103dae675e5788eb011fb77ade8e3f',
-    pubkey: 'Si9veMEER0LGTcLL6xwRWxUB7UCF7jjb00548e0ddc1501de0f'
-  },
-  {
-    envName: 'development',
-    appID: 'wxcee598c3eb71e48d',
-    appName: '智慧旭奇',
-    version: '1.0.0',
-    baseUrl: 'http://47.92.245.35:5002',
-    // 接口前缀
-    fileUrl: 'http://47.92.245.35:5009/xq-ssg',
-    // 图片服务器
-    loginPath: '/admin-api/system/auth/wechat/app/login',
-    // 登陆接口
-    aMapKey: '6e488a3ed079adbb01de2ecb88ca5905',
-    // 高德地图key
-    pubkey: 'O9eM4Cv5bpi30mgUw9GEkf19KVE8KE8D00a46a6e50bb9465b2' // 吾来对话机器人平台key
-  }
+  envName: 'production',
+  appID: 'wx736395182f05a1b7',
+  appName: '介休网格通',
+  version: '1.0.0',
+  baseUrl: 'https://jxwgtjm.xuqidata.com:8088',
+  fileUrl: 'https://jiexiu.xuqidata.com:8083/jiexiujumin',
+  loginPath: '/admin-api/system/auth/wechat/app/login',
+  aMapKey: '29103dae675e5788eb011fb77ade8e3f',
+  pubkey: 'Si9veMEER0LGTcLL6xwRWxUB7UCF7jjb00548e0ddc1501de0f'
+},
+{
+  envName: 'development',
+  appID: 'wxcee598c3eb71e48d',
+  appName: '智慧旭奇',
+  version: '1.0.0',
+  baseUrl: 'http://47.92.245.35:5002',
+  // 接口前缀
+  fileUrl: 'http://47.92.245.35:5009/xq-ssg',
+  // 图片服务器
+  loginPath: '/admin-api/system/auth/wechat/app/login',
+  // 登陆接口
+  aMapKey: '6e488a3ed079adbb01de2ecb88ca5905',
+  // 高德地图key
+  pubkey: 'O9eM4Cv5bpi30mgUw9GEkf19KVE8KE8D00a46a6e50bb9465b2' // 吾来对话机器人平台key
+}
 ];
 
 const isFind = envs.find((item) => item.envName === envName);
diff --git a/src/main.ts b/src/main.ts
index eedbdf7..9d16edc 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -30,7 +30,8 @@ import {
   Field,
   TimePicker,
   DatePicker,
-  Form
+  Form,
+  CheckboxGroup
 } from 'vant';
 
 import share from '@/utils/share.js'
@@ -85,6 +86,7 @@ export function createApp() {
   app.use(TimePicker);
   app.use(DatePicker);
   app.use(Form);
+  app.use(CheckboxGroup);
   // app.mixin(zpMixins);
   return {
     app
diff --git a/src/packages/people/pages/masses-create/masses-create.vue b/src/packages/people/pages/masses-create/masses-create.vue
index 30eee33..27a7695 100644
--- a/src/packages/people/pages/masses-create/masses-create.vue
+++ b/src/packages/people/pages/masses-create/masses-create.vue
@@ -91,9 +91,9 @@
       </view>
 
       <view class="form-treaty">
-        <van-checkbox label-disabled :value="checked" shape="square" use-icon-slot @change="onCheckbox">
-          <image class="ic-check" slot="icon"
-            :src="checked ? '/static/images/ic-radio1.png' : '/static/images/ic-radio.png'" />
+        <van-checkbox label-disabled checked-color="red" v-model="checked" shape="square" use-icon-slot @change="onCheckbox">
+          <!-- <image class="ic-check"
+            :src="checked ? '/static/images/ic-radio1.png' : '/static/images/ic-radio.png'" /> -->
           <view class="checbox-text flex">
             <!-- <text>我已阅读《</text>
         <navigator class="jump-to">申请党员帮办</navigator>
@@ -109,11 +109,30 @@
       </view>
     </view>
 
-    <van-dialog :show="isDialog" closeOnClickOverlay
+    <van-dialog :show="isDialog" closeOnClickOverlay @confirm="isDialog = false"
       message="群众点单是针对发展党员的程序流程基本要求、党的理论方针、支部周期性工作动态、党员志愿者帮扶及对上级支部的意见建议进行点单。不涉及以上点单类型的建议您拨打政务服务热线0354-7221890" />
 
-    <wux-cascader :visible="isVisible" title="所在村/社区" :options="optionData" :safe-area-inset-bottom="true"
-      :defaultFieldNames="defaultFieldNames" @close="onCloseVisible" @change="onChangeVisible" />
+      <van-field
+      v-model="FiledVisible"
+      is-link
+      readonly
+      label="所在村/社区"
+      placeholder="请选择所在地区"
+      @click="isVisible = true"
+    />
+    <van-popup v-model:show="isVisible" round position="bottom">
+      <van-cascader
+        v-model="currentValue"
+        title="请选择所在地区"
+        :options="optionData"
+        :field-names="defaultFieldNames"
+        @close="onCloseVisible"
+        @change="onChangeVisible"
+      />
+    </van-popup>
+
+    <!-- <wux-cascader :visible="isVisible" title="所在村/社区" :options="optionData" :safe-area-inset-bottom="true"
+      :defaultFieldNames="defaultFieldNames" @close="onCloseVisible" @change="onChangeVisible" /> -->
   </view>
 </template>
 
@@ -126,7 +145,8 @@
   import * as peopleApi from '@/api/peopleApi';
   import * as publicApi from '@/api/publicApi';
   export default {
-    components: {},
+    components: {
+    },
     data() {
       return {
         userInfoData: uni.getStorageSync('userInfoData'),
@@ -173,6 +193,7 @@
 
         // 级连选择器数据 start
         isVisible: false,
+        FiledVisible:true,
 
         optionData: [],
         currentTile: '请选择',
@@ -184,7 +205,7 @@
         // 级联选择默认显示字段
         // 级连选择器数据 end
         defaultFieldNames: {
-          label: 'name',
+          text: 'name',
           value: 'id',
           children: 'children'
         },
@@ -363,7 +384,7 @@
       },
 
       onCheckbox(event) {
-        this.checked = event.detail
+        this.checked = event
       },
 
       onOpenVisible() {
diff --git a/src/packages/people/pages/mediate-create/mediate-create.vue b/src/packages/people/pages/mediate-create/mediate-create.vue
index 1b6e9b7..d6609db 100644
--- a/src/packages/people/pages/mediate-create/mediate-create.vue
+++ b/src/packages/people/pages/mediate-create/mediate-create.vue
@@ -104,8 +104,27 @@
       </view>
     </view>
 
-    <wux-cascader :visible="isVisible" title="所在村/社区" :options="optionData" :safe-area-inset-bottom="true"
-      :defaultFieldNames="defaultFieldNames" @close="onCloseVisible" @change="onChangeVisible" />
+    <van-field
+      v-model="FiledVisible"
+      is-link
+      readonly
+      label="所在村/社区"
+      placeholder="请选择所在地区"
+      @click="isVisible = true"
+    />
+    <van-popup v-model:show="isVisible" round position="bottom">
+      <van-cascader
+        v-model="currentValue"
+        title="请选择所在地区"
+        :options="optionData"
+        :field-names="defaultFieldNames"
+        @close="onCloseVisible"
+        @change="onChangeVisible"
+      />
+    </van-popup>
+
+    <!-- <wux-cascader :visible="isVisible" title="所在村/社区" :options="optionData" :safe-area-inset-bottom="true"
+      :defaultFieldNames="defaultFieldNames" @close="onCloseVisible" @change="onChangeVisible" /> -->
   </view>
 </template>
 
@@ -162,6 +181,7 @@
 
         // 选择后的名称
         currentValue: null,
+        FiledVisible:true,
 
         // 选择后的id
         // 级联选择默认显示字段
diff --git a/src/pages/people/people.vue b/src/pages/people/people.vue
index 2cf559b..03b931d 100644
--- a/src/pages/people/people.vue
+++ b/src/pages/people/people.vue
@@ -56,6 +56,7 @@
         </view>
       </view>
     </view>
+    <view style="height:150rpx"></view>
   </view>
 </template>
 <script>
@@ -90,8 +91,7 @@
     },
     methods: {
       updateQuery(url, name) {
-        console.log(this.$tootls)
-        // return utils.updateQuery(url, name);
+        return utils.updateQuery(url, name);
       },
       /**
        * 接口
@@ -159,7 +159,6 @@
         const url = urlArray[0].replace(/(?:\[)(.*?)(?:\])/g, function(_, it) {
           return item[it];
         });
-        
         uni.navigateTo({
           url: url || ''
         });
diff --git a/src/utils/util.map.js b/src/utils/util.map.js
index 347e198..558a0b6 100644
--- a/src/utils/util.map.js
+++ b/src/utils/util.map.js
@@ -10,7 +10,7 @@ function log(obj) {
  * JSON字符串转JSON对象
  * @param str JSON字符串
  */
-var str2Json = function(str) {
+var str2Json = function (str) {
   if (!str) return;
 
   var json = JSON.parse(str);
@@ -21,7 +21,7 @@ var str2Json = function(str) {
  * 检查字符串是否是null或''
  * @param str 字符串
  */
-var isNull = function(str) {
+var isNull = function (str) {
   return str ? str : '---';
 };
 
@@ -43,7 +43,7 @@ function getFullUrl(fileHost, url) {
  * @param   fileHost  静态资源基地址
  * @param   filesStr  文件数组(JSON字符串)
  */
-var getSingleFullUrl = function(fileHost, filesStr) {
+var getSingleFullUrl = function (fileHost, filesStr) {
   if (!filesStr) return false;
   var files = str2Json(filesStr);
 
@@ -60,7 +60,7 @@ var getSingleFullUrl = function(fileHost, filesStr) {
  * @param  arr 字符串数组
  * @param  str 检测的字符串
  */
-var isIncluded = function(arr, str) {
+var isIncluded = function (arr, str) {
   return arr.indexOf(str) >= 0;
 };
 
@@ -70,7 +70,7 @@ var isIncluded = function(arr, str) {
  * @param  str 展示的日期司机 默认0
  * 0 (年-月-日 时:分:秒) 1 (x年-x月-x日 时:分:秒) 2 (x年-x月-x日) 3 (时:分:秒)
  */
-var getDateTime = function(value, type) {
+var getDateTime = function (value, type) {
   //不能使用 new Date()
   var time = new Date(value);
   var year = time.getFullYear();
@@ -134,13 +134,9 @@ function updateQuery(url, item) {
   if (!item) {
     return url;
   }
-
-  if (url !== undefined) {
-    let urlRegex = /(\?|&)name=[^&]*/g;
-    return url.replace(urlRegex, function(_, it) {
-      return item[it];
-    });
-  }
+  let name = item.name;
+  let newUrl = url.replace(/name=\[name\]/, 'name=' + name);
+  return newUrl;
 }
 
 function formatStr(str) {
diff --git a/vite.config.ts b/vite.config.ts
index 46e36fe..c97b2d7 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -4,4 +4,15 @@ import uni from "@dcloudio/vite-plugin-uni";
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [uni()],
+  // publicPath: './',
+  // server: {
+  //   proxy: {
+  //     "/admin-api": { // “/api” 以及前置字符串会被替换为真正域名
+  //       target: "http://47.92.245.35:5002", // 请求域名
+  //       secure: false, // 请求是否为https
+  //       changeOrigin: true, // 是否跨域
+  //       rewrite: (path) => path.replace(/^\/admin-api/, "")
+  //     }
+  //   }
+  // }
 });