From 776bbeb3af7b0a748de9d7060d006b8e8628550f Mon Sep 17 00:00:00 2001
From: xiaohei <1494046114@qq.com>
Date: Fri, 10 Nov 2023 00:01:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E5=8F=B7=E7=99=BB=E9=99=86=E9=A1=B5=E9=9D=A2=E3=80=81=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=AF=BC=E8=88=AA=E6=A0=8F=E9=AB=98=E5=BA=A6=E3=80=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9A=E4=BD=8D=E4=BD=8D=E7=BD=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E3=80=81=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E3=80=81=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom-nav-bar/custom-nav-bar.vue         |  4 +-
 src/config/constant.js                        | 49 +++++++++++--------
 .../life/pages/scenic-list/scenic-list.vue    |  4 +-
 .../my/pages/collection/collection.vue        | 15 +++---
 src/packages/my/pages/setup/setup.vue         |  8 ++-
 src/packages/people/pages/second/second.vue   | 15 +++---
 .../public/pages/web-view/web-view.vue        |  2 +-
 src/pages.json                                |  4 +-
 src/pages/enterprise/enterprise.vue           |  2 +-
 src/pages/life/life.vue                       |  6 +--
 src/pages/my/my.vue                           | 31 ++++++------
 src/pages/phone/index.vue                     |  7 ++-
 12 files changed, 82 insertions(+), 65 deletions(-)

diff --git a/src/components/custom-nav-bar/custom-nav-bar.vue b/src/components/custom-nav-bar/custom-nav-bar.vue
index 8caea4b..2a061ae 100644
--- a/src/components/custom-nav-bar/custom-nav-bar.vue
+++ b/src/components/custom-nav-bar/custom-nav-bar.vue
@@ -1,6 +1,6 @@
 <template>
   <view style="height: 100%">
-    <view v-if="position === 'fixed'" :style="'height: calc(46px + 17rpx);'" />
+    <view v-if="position === 'fixed'" :style="'height: calc(103px + 17rpx);'" />
 
     <view
       :class="'custom-nav-bar ' + (position === 'fixed' ? 'custom-nav-bar__fixed' : '') + ' ' + (position === 'absolute' ? 'custom-nav-bar__absolute' : '')"
@@ -9,7 +9,7 @@
                 zIndex +
                 ';background-color: ' +
                 (color === 'white' ? 'transparent' : '#ffffff') +
-                ';height:calc(46px + 17rpx);'
+                ';height:calc(103px + 17rpx);'
             ">
       <view :class="'custom-nav-bar-content__content ' + (border ? 'custom-nav-bar__border-bottom' : '')">
         <view class="custom-nav-bar-content__left" @click="onClickLeft">
diff --git a/src/config/constant.js b/src/config/constant.js
index b09a5c8..43b442b 100644
--- a/src/config/constant.js
+++ b/src/config/constant.js
@@ -14,26 +14,35 @@ import env from './env';
 import amap from "@/lib/wx-map-sdk/amap-wx.130.js";
 function getLocationInfo() {
   const info = {};
-  uni.getLocation(function(res) {
-    console.log('纬度：' + res.latitude);
-    console.log('经度：' + res.longitude);
-  });
-  const myAmapFun = new amap.AMapWX({
-      key: env.aMapKey
-  });
-  myAmapFun.getRegeo({
-      success: function (res) {
-          if (!res.length) {
-              return;
-          }
-          Object.assign(info, res[0]);
-      },
-      fail: function (info) {
-          uni.showModal({
-              title: info.errMsg
-          });
-      }
-  });
+  // uni.getLocation(function(res) {
+  //   console.log('纬度：' + res.latitude);
+  //   console.log('经度：' + res.longitude);
+  // });
+  uni.request({
+    url: 'https://www.cz88.net/api/cz88/ip/base?ip=',
+    success: (res) => {
+      console.log(res.data.data.locations);
+      let latitudObj = res.data.data.locations[0]
+      // this.text = 'request success';
+      uni.setStorageSync('userLocation', latitudObj.latitude + ',' + latitudObj.longitude)
+    }
+  })
+  // const myAmapFun = new amap.AMapWX({
+  //     key: env.aMapKey
+  // });
+  // myAmapFun.getRegeo({
+  //     success: function (res) {
+  //         if (!res.length) {
+  //             return;
+  //         }
+  //         Object.assign(info, res[0]);
+  //     },
+  //     fail: function (info) {
+  //         uni.showModal({
+  //             title: info.errMsg
+  //         });
+  //     }
+  // });
   return info;
 }
 export default {
diff --git a/src/packages/life/pages/scenic-list/scenic-list.vue b/src/packages/life/pages/scenic-list/scenic-list.vue
index 57a4c74..424cfc8 100644
--- a/src/packages/life/pages/scenic-list/scenic-list.vue
+++ b/src/packages/life/pages/scenic-list/scenic-list.vue
@@ -1,12 +1,12 @@
 <template>
   <view>
-    <custom-nav-bar position="fixed" color="black" :left-text="optin.name" left-arrow />
+    <custom-nav-bar color="black" :left-text="optin.name" left-arrow />
 
     <view class="search">
       <view class="flex flex-between search-input">
         <input class="input" :value="searchValue" type="text" confirm-type="search"
           placeholder-class="placeholder-style" placeholder="请输入搜索商户名称" @input="onSearch" @confirm="onChange" />
-        <view class="search-icon flex flex-center">
+        <view class="search-icon flex flex-center" @click="onSearch">
           <image class="imgage" src="/static/images/search.png"></image>
         </view>
       </view>
diff --git a/src/packages/my/pages/collection/collection.vue b/src/packages/my/pages/collection/collection.vue
index 1d6a5a9..faaacec 100644
--- a/src/packages/my/pages/collection/collection.vue
+++ b/src/packages/my/pages/collection/collection.vue
@@ -3,11 +3,11 @@
     <custom-nav-bar position="fixed" color="black" left-text="我的收藏" left-arrow />
 
     <view class="life-section">
-      <van-tabs :active="tabs.active" @change="onChange($event, { tagId: 'collectionTabs' })" id="collectionTabs"
+      <van-tabs :active="tabs.active" @click-tab="onChange($event, { tagId: 'collectionTabs' })" id="collectionTabs"
         line-width="40px">
-        <van-tab :title="key.label" :data-item="key" v-for="(key, index) in tabs.typeList" :key="index">
-          <view>
-            <view v-if="myInfoPageList.length !== 0" class="life-conent" @tap="headleDetails" :data-item="item"
+        <van-tab :title="key.label" :name="key.value" :data-item="key" v-for="(key, index) in tabs.typeList" :key="index">
+          <view v-if="myInfoPageList.length !== 0">
+            <view  class="life-conent" @tap="headleDetails" :data-item="item"
               v-for="(item, index1) in myInfoPageList" :key="index1">
               <image class="life-conent-image" :src="item.merchantPhoto"></image>
 
@@ -92,15 +92,16 @@
 
       onChange(event, _dataset) {
         /* ---处理dataset begin--- */
-        this.handleDataset(event, _dataset);
+        // this.handleDataset(event, _dataset);
         /* ---处理dataset end--- */
+        console.log(event)
         const {
           typeList
         } = this.tabs;
         this.tabs = {
           typeList: typeList,
-          active: event.detail.index,
-          merchantType: typeList[event.detail.name].value
+          active: event.name,
+          merchantType: typeList[event.name].value
         }
         this.myInfoPageApi();
       },
diff --git a/src/packages/my/pages/setup/setup.vue b/src/packages/my/pages/setup/setup.vue
index bfb490b..3bc5b99 100644
--- a/src/packages/my/pages/setup/setup.vue
+++ b/src/packages/my/pages/setup/setup.vue
@@ -1,5 +1,5 @@
-<strong></strong><template>
-  <view style="height: 100%">
+<template>
+  <view>
     <custom-nav-bar position="fixed" color="black" left-text="设置" left-arrow />
 
     <view class="page-content">
@@ -82,9 +82,7 @@
     },
     async onLoad() {},
     onShow() {
-      this.setData({
-        userInfo: uni.getStorageSync('userInfoData')
-      });
+      this.userInfo = uni.getStorageSync('userInfoData')
     },
     methods: {
       signOut() {
diff --git a/src/packages/people/pages/second/second.vue b/src/packages/people/pages/second/second.vue
index a3aef2e..14fb0ba 100644
--- a/src/packages/people/pages/second/second.vue
+++ b/src/packages/people/pages/second/second.vue
@@ -55,7 +55,7 @@
         <view class="section-item-left flex1 flex flex-between flex-col">
           <view class="consult-content-title text-line-1">{{ item.title }}</view>
           <view class="consult-content-block">
-            <!-- <text>{{ toods.getDateTime(item.createTime) }}</text> -->
+            <text>{{ getDateTime(item.createTime) }}</text>
             <text class="ml-30">{{ item.publisher }}</text>
           </view>
         </view>
@@ -87,7 +87,7 @@
                 <view class="section-item-left flex1 flex flex-between flex-col">
                   <view class="consult-content-title multi-line">{{ item.title }}</view>
                   <view class="consult-content-block">
-                    <text>{{ toods.getDateTime(item.createTime) }}</text>
+                    <text>{{ getDateTime(item.createTime) }}</text>
                     <text class="ml-30">{{ item.publisher }}</text>
                   </view>
                 </view>
@@ -122,7 +122,8 @@
   import * as peopleApi from '@/api/peopleApi';
   import * as publicApi from '@/api/publicApi';
   import * as enterprise from '@/api/enterprise';
-  import utils from '@/utils/util.js'
+  import utils from '@/utils/util.map'
+  import util from '@/utils/util'
 
   // 民生 - 家庭医生列表 / 党建引领 复用
   export default {
@@ -169,6 +170,10 @@
       updateQuery(url, name) {
         return utils.updateQuery(url, name);
       },
+      getDateTime(tiem){
+        console.log(time)
+        return utils.getDateTime(tiem)
+      },
       /**
        * 接口
        */
@@ -232,7 +237,7 @@
         } = await peopleApi.hospitalPageApi(param);
         if (list.length) {
           list.forEach((e) => {
-            e.createTime = utils.timeFormat(e.createTime, 'yyyy-mm-ss');
+            e.createTime = util.timeFormat(e.createTime, 'yyyy-mm-ss');
           });
           this.newsPageList = list
         }
@@ -308,7 +313,6 @@
           const {
             list = [], total = 0
           } = res.data;
-          console.log(list)
           if (reset) {
             _goodsList = list;
           } else {
@@ -375,7 +379,6 @@
           item
         } = event.currentTarget.dataset;
         let orgId = event.currentTarget.dataset.item.orgId;
-        console.log(item);
         uni.navigateTo({
           url: `/packages/people/pages/second/second-community?name=${name}&key=${key}&orgId=${orgId}&gridId=${item.id}`
         });
diff --git a/src/packages/public/pages/web-view/web-view.vue b/src/packages/public/pages/web-view/web-view.vue
index d1f191e..e604ad0 100644
--- a/src/packages/public/pages/web-view/web-view.vue
+++ b/src/packages/public/pages/web-view/web-view.vue
@@ -1,6 +1,6 @@
 <template>
   <view>
-    <custom-nav-bar position="absolute" color="black" :left-text="optins.name" left-arrow />
+    <custom-nav-bar position="fixed" color="black" :left-text="optins.name" left-arrow />
     <web-view v-if="optins.name === '手机充值' || optins.name === '生活缴费'" :src="url"></web-view>
 
     <image v-else class="img" mode="aspectFit" src="/static/packages/public/pages/web-view/img.jpg"
diff --git a/src/pages.json b/src/pages.json
index a76cdbf..414ae04 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -33,7 +33,9 @@
     },
     {
       "path": "pages/phone/index",
-      "style": {}
+      "style": {
+        "navigationStyle": "custom"
+      }
     },
     {
       "path": "pages/agreement/user-agreement",
diff --git a/src/pages/enterprise/enterprise.vue b/src/pages/enterprise/enterprise.vue
index 42b26c4..0f5dc11 100644
--- a/src/pages/enterprise/enterprise.vue
+++ b/src/pages/enterprise/enterprise.vue
@@ -220,7 +220,7 @@ export default {
       } = this;
       if (!isLogin) {
         uni.navigateTo({
-          url: '/pages/authorize/authorize'
+          url: '/pages/phone/index'
         });
         return false;
       }
diff --git a/src/pages/life/life.vue b/src/pages/life/life.vue
index 1d9cedd..f2a54ca 100644
--- a/src/pages/life/life.vue
+++ b/src/pages/life/life.vue
@@ -6,7 +6,7 @@
       :indicator-active-color="indicatorActiveColor">
       <block v-for="(item, index) in imageList" :key="index">
         <swiper-item>
-          <navigator v-if="item.clickUrl" class="line-navigator" :url="updateQuery(itemName.clickUrl,item)" hover-class="none"></navigator>
+          <navigator v-if="item.clickUrl" class="line-navigator" :url="updateQuery(itemName.clickUrl,itemName)" hover-class="none"></navigator>
           <image class="custom-swiper-img" :src="item.pic"></image>
         </swiper-item>
       </block>
@@ -20,7 +20,7 @@
 
         <view class="menu flex flex-v-center flex-between" v-if="index === 0">
           <view class="menu-item" :style="itemName.cssStyle" v-for="(itemName, idx) in item.children" :key="idx">
-            <navigator v-if="itemName.clickUrl" class="line-navigator" :url="updateQuery(itemName.clickUrl,item)" hover-class="none">
+            <navigator v-if="itemName.clickUrl" class="line-navigator" :url="updateQuery(itemName.clickUrl,itemName)" hover-class="none">
             </navigator>
 
             <image class="menu-item-ic-img" :src="itemName.icon"></image>
@@ -32,7 +32,7 @@
         <view class="second-model flex flex-v-center flex-between" v-else>
           <view :class="'second-line flex flex-col ' + (idx === 0 ? 'line1' : '')" :style="itemName.cssStyle"
             v-for="(itemName, idx) in item.children" :key="idx">
-            <navigator v-if="itemName.clickUrl" class="line-navigator" :url="updateQuery(itemName.clickUrl,item)" hover-class="none">
+            <navigator v-if="itemName.clickUrl" class="line-navigator" :url="updateQuery(itemName.clickUrl,itemName)" hover-class="none">
             </navigator>
             <!-- <image  ></image> -->
             <image class="line-bg" :src="itemName.icon"></image>
diff --git a/src/pages/my/my.vue b/src/pages/my/my.vue
index 3df3660..8f1978d 100644
--- a/src/pages/my/my.vue
+++ b/src/pages/my/my.vue
@@ -17,7 +17,7 @@
           <view class="name" @tap="login" v-else>请登录</view>
           <!-- <view class="role" wx:if="{{role}}">{{role}}</view> -->
         </view>
-        <image class="top-right" @tap="toSetup"
+        <image class="top-right" @click="toSetup"
           src="https://zongzhi.xuqidata.com:5009/xq-ssg/bc0a28c4073688213c2dbf320d21d24048fab2f9a36d2afec51e831591e58188.png">
         </image>
       </view>
@@ -294,21 +294,22 @@
        * 接口
        */
       async login() {
-          // 我的诉求
-          const res = await app.globalData.register({
-              code: this.code
-          });
-          if (res) {
-              uni.showToast({
-                  title: '登录成功',
-                  icon: 'none'
-              });
-              this.getInitData();
-          } else {
-              uni.navigateTo({
+        uni.navigateTo({
                   url: '/pages/phone/index'
-              });
-          }
+        });
+          // 我的诉求
+          // const res = await app.globalData.register({
+          //     code: this.code
+          // });
+          // if (res) {
+          //     uni.showToast({
+          //         title: '登录成功',
+          //         icon: 'none'
+          //     });
+          //     this.getInitData();
+          // } else {
+              
+          // }
       },
 
       // 获取我的信息
diff --git a/src/pages/phone/index.vue b/src/pages/phone/index.vue
index 51bcc42..1c73593 100644
--- a/src/pages/phone/index.vue
+++ b/src/pages/phone/index.vue
@@ -1,5 +1,7 @@
 <template>
-  <view style="height: 100%">
+  <view>
+    <custom-nav-bar left-text="登陆" left-arrow />
+
     <view
       class="container"
       style="
@@ -194,6 +196,7 @@ export default {
         })
         uni.setStorageSync("userId", res.data.userId);
         uni.setStorageSync("token", res.data.accessToken);
+        uni.setStorageSync("isLogin", true);
         uni.switchTab({
           url: "/pages/my/my",
         });
@@ -306,7 +309,7 @@ export default {
 
 .add-commutnity {
   position: absolute;
-  top: 35%;
+  top: 45%;
   left: 0;
 }