From 62ca7da81ba00fc33d060258657e4e32966e9381 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Thu, 16 Nov 2023 19:09:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=9A=E4=BD=8D=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                              |   8 +
 pages/select_address/select_address.vue | 217 ++++++++++++++++++++++++
 pages/store/settled/index.vue           |   4 +-
 static/images/re_address.png            | Bin 0 -> 1427 bytes
 4 files changed, 227 insertions(+), 2 deletions(-)
 create mode 100644 pages/select_address/select_address.vue
 create mode 100644 static/images/re_address.png

diff --git a/pages.json b/pages.json
index 29cd046..6c1f031 100644
--- a/pages.json
+++ b/pages.json
@@ -178,6 +178,14 @@
                 "enablePullDownRefresh": false
             }
             
+        },
+        {
+          "path" : "pages/select_address/select_address",
+          "style" : 
+          {
+            "navigationBarTitleText" : "选择位置",
+            "enablePullDownRefresh" : false
+          }
         }
     ],
 	"subPackages": [{
diff --git a/pages/select_address/select_address.vue b/pages/select_address/select_address.vue
new file mode 100644
index 0000000..c93b55e
--- /dev/null
+++ b/pages/select_address/select_address.vue
@@ -0,0 +1,217 @@
+<template>
+  <view class="">
+    <u-sticky customNavHeight="0">
+      <view class="head_top">
+        <u-search placeholder="搜索小区、办公楼等" :showAction="false"></u-search>
+        <view style="height: 20rpx;"></view>
+        <u-tabs 
+          :list="tabsList" itemStyle="font-size: 32rpx;height: 74rpx;" 
+          :current="current"
+          @change="changeCurrent"
+          lineColor="#FF6D20"
+          lineWidth="105rpx"
+          height="7rpx"
+          ></u-tabs>
+        </u-tabs>
+      </view>
+    </u-sticky>
+    <view style="background-color: #f4f4f4;height: 30rpx;"></view>
+    <view class="address-box" v-if="current==0">
+      <view class="head_item">
+        <view class="re-location">
+          <view class="re-title">当前位置: </view>
+          <view>{{street}}</view>
+        </view>
+        <view class="re-btn"><image class="re-address-img" src="@/static/images/re_address.png"></image>重新定位</view>
+      </view>
+      <view class="head_item_tips">
+        <view>附近地址</view>
+      </view>
+      <view class="address-list">商业宾馆（春雨路二段）</view>
+      <view class="address-list">商业宾馆（春雨路二段）</view>
+      <view class="address-list">商业宾馆（春雨路二段）</view>
+    </view>
+    <view class="address-box" v-if="current==1">
+      <view class="head_item_tips">
+        <view>泸州区县</view>
+      </view>
+      <view class="area">
+        <view class="area-item" :class="{'area-item-on': item==2}" v-for="item in 7" >江阳区</view>
+      </view>
+      <view class="head_item_tips">
+        <view>选择街道/镇</view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import {
+  	getGeocoder,
+  	merClassifly,
+    getProductslist
+  } from '@/api/store.js';
+  export default {
+    data() {
+      return {
+        tabsList: [{
+          name: '附近地址',
+        }, {
+          name: '泸州区县',
+        }, ],
+        current: 1,
+        latitude: '',
+        longitude: '',
+        town: '',
+        street_id: '',
+        street: ''
+      }
+    },
+    onLoad() {
+      this.getLoaction();
+    },
+    onShow() {},
+    methods: {
+      changeCurrent(e){
+        this.current = e.index;
+      },
+      getLoaction(){
+        this.street = '定位中'
+        uni.getLocation({
+        	type: 'wgs84',
+        	timeout: '10',
+        	success: (res) => {
+        		let latitude, longitude;
+        		latitude = res.latitude.toString();
+        		longitude = res.longitude.toString();
+        		this.latitude = res.latitude.toFixed(6);
+        		this.longitude = res.longitude.toFixed(6);
+            this.$store.commit('setLocation', {
+              lat: res.latitude.toFixed(6), 
+              long: res.longitude.toFixed(6),
+            });
+        		getGeocoder({
+        			lat: latitude,
+        			long: longitude
+        		}).then(res => {
+        			this.town = res.data.address_reference.town.title
+        			this.street_id = res.data.address_reference.town.id
+        			this.street = res.data.address_reference.town.title;
+        
+        		}).catch(err => {
+        			uni.showToast({
+        				title: err,
+        				icon: 'none'
+        			})
+              this.street = '定位失败'
+        		})
+        	},
+        	fail: (err) => {
+            console.log('定位失败');
+        		this.isshow = false
+            uni.setStorageSync("RejectTarget", true)
+            Toast('定位失败,请检查定位权限是否开启')
+            this.street = '定位失败'
+            
+        		// uni.showToast({
+        		// 	title: "获取定位超时",
+        		// 	icon: 'none',
+        		// 	duration: 2000
+        		// });
+        	}
+        });
+      }
+    },
+    onPullDownRefresh() {
+      uni.stopPullDownRefresh()
+    }
+  }
+</script>
+
+<style lang="scss">
+  page{
+    background-color: #fff;
+  }
+  .head_top {
+    background-color: #fff;
+    padding: 28rpx;
+  }
+  .address-box{
+    // background-color: red;
+    border-radius: 21rpx 21rpx 0rpx 0rpx;
+    padding: 30rpx 28rpx;
+    .head_item{
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding-bottom: 28rpx;
+      font-size: 28rpx;
+      font-family: PingFang SC-Regular, PingFang SC;
+      font-weight: 400;
+      color: #333333;
+      .re-location{
+        display: flex;
+        .re-title{
+          flex-shrink: 0;
+          padding-right: 14rpx;
+        }
+      }
+      .re-address-img{
+        width: 38.55rpx;
+        height: 38.55rpx;
+        margin-right: 14rpx;
+      }
+      .re-btn{
+        display: flex;
+        align-items: center;
+        flex-shrink: 0;
+        padding-left: 14rpx;
+      }
+    }
+    .head_item_tips{
+      height: 44rpx;
+      font-size: 32rpx;
+      font-family: PingFang SC-Regular, PingFang SC;
+      font-weight: 400;
+      color: #737373;
+    }
+    .address-list{
+      font-size: 28rpx;
+      font-family: PingFang SC-Regular, PingFang SC;
+      font-weight: 400;
+      color: #333333;
+      height: 80rpx;
+      line-height: 75rpx;
+      border-bottom: 1rpx solid rgba(0,0,0,0.1);
+    }
+    
+    .area{
+      display: flex;
+      flex-wrap: wrap;
+      padding-top: 30rpx;
+      .area-item{
+        // width: 158rpx;
+        height: 64rpx;
+        // background: #F4F4F4;
+        background-color: #fff;
+        border-radius: 11rpx 11rpx 11rpx 11rpx;
+        border: 2rpx solid #B3B3B3;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        padding: 0 20rpx;
+        font-size: 28rpx;
+        font-family: PingFang SC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #737373;
+        margin-bottom: 22rpx;
+        margin-right: 22rpx;
+      }
+      .area-item-on{
+        background-color: #F4F4F4;
+        color: #333;
+        font-weight: bold;
+      }
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index 4a64586..761b331 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -648,7 +648,7 @@
 					`${this.business[0][this.index2[0]].name} ${this.business[1][this.index2[1]].name} ${this.business[2][this.index2[2]].name}`
 				this.area_id = this.business[0][this.index2[0]].code
 				this.street_id = this.business[1][this.index2[1]].code
-
+        if(this.merchantData.mer_type==12) return ; //市级供应链不需要查询镇农科公司
 				merstreet({
 					street_code: this.street_id
 				}).then((res) => {
@@ -1046,7 +1046,7 @@
 				});
 
 				if (!this.mer_storeType) return that.$util.Tips({
-					title: '请选择商户类型'
+					title: '请选择店铺类型'
 				})
 				if (!this.business_name) return that.$util.Tips({
 					title: '请选择店铺所在地'
diff --git a/static/images/re_address.png b/static/images/re_address.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d7daacacbe74f5ad618f3ebf80168e07d8bb9a9
GIT binary patch
literal 1427
zcmV;E1#J3>P)<h;3K|Lk000e1NJLTq001li001lq1^@s69)wx}00001b5ch_0Itp)
z=>Px)O-V#SR9HvtnO}%hRUF5^zjIe-W_L6fwW7$q3qEY1R1ZB!J=_@;6pL0WFf!cG
zK*>lUsE42pdax&rjD(DmHY9w|XvGC>=R!q64+d?t4}y0$h)iME*%{~VdguJ&-nlc~
z9q-J!cV-j>@6)p9{LcBD@A;nJ`7?yO?4!Gk7x#c~_l$K^Vcz)gN=Iq~fat1#OQ%a{
zm+1S;S2{J2wt)XNR;QPt=Xnws1j7K)icm1-SrAN?JUWLP-`sCrEwnm-mVkL<{{!=7
zeg}lTAWFvSoY@BBSVE&ittcNG*f#VxK^P8E(*g4YKxq)xdV^qG0=NL8bpU*u_``Em
zXACDz>!UaWjtuNh|8nX%1)?p14jh0-%MvGwC|+=<dOoYa$Dm=i4uOXg<JS9bY!7-i
zX#%?ddS($k^H`pXFGjUVB;bOfKiEZd9t2mZ%EvrLjDrc&nhYuw2E3@;&<B`sc+tR_
zCmlv6ZCd}R)K&slluiE}fVEl5H&W)*@vz2Kz}1+N(YJ?490non3ox1I;*%<+mB4mJ
zKUY(OQD81_O_|d_Hc}!gup3`8);vw5oeMyZC3Du+W-2!Y_7<3+BYp!m%kt)Cux`CL
zz%^*0od;0KHj)oCTZj#TE55~_)oj30zShVFK}BvDefxzFAN!r}OPba(l`lPe2=SS3
zjai5BXd^#21h%vKVSo-)7no|Qs!%hAzM@-@2Yg)?_NhEsjay_r@R8)Wbuet8p}>9$
zyXtQW4oO~LpAA&1#VwzAvxlJHy_Cmn=ef8#Y_Org3x>W+3i{H|UuTlz*7mpnt<<-(
z{oes_^E8Cyp{1sEqQ0F_U^}ay258W&T$a4O$F$D00uVQ*Xy}8QpwrES3J1>UGyY<8
z^0Lqy)rWBb>+5?~6zLh?7PHBm)vHuEZ#=YWsYqP)7u#>iob^PzAaUaDjD8VBkGnAo
za(?x4^Y3fH_*)eAlDW`+r~u;<5s%b&$da#>KwtNo)@&S@U?xd{UnW7TZfTn_1R~x2
zzm&Y8+q8aB0P6+`%BesYawIiA^@^%qSa~U{pCr%@RV+)+q)f}~2rvO7iSf%V0ncaq
zzhYo#hk&D40$1`Vj<mWM-Nltg_mC!N<*k;Woz?SnBum_Ni_RUfT}^8YC(m~{tx<Xg
z<n4CR(wYaH?LP(J1@~`a9!%t{Z&iNlMEQJ1e~yX#O^QQz*wBrmWavXA=nEfWG&z3x
z*-ikd+6ZpVEcw-xY5B*4|05e8eni^cJiIgNP3f#(X8tvy>ad;iIpdLaOQ`FjX9vK}
z%R=<SPsJ9kA1{*vp91X6$s2d(c<BPyAK-<QdzPA0pQ}`~jlS0*#8I!Fl>3wB)F-N#
z1*31b6ryrRWNz&M@2MQTA~D+<<fbLL>7SYb#JwWj%&d8;3~{0MAfp&$>`SPI@|I@M
zaeynZ+E~Xfp{|nt?c-Mv4fs=LGxPpb1A9aTE*X8hiRfreS;j=33ma6sr&8g7pK~?n
zir2;n@~uQ}`j4PRRKN?F{>LQv(Bg*_OgPM&JMxfHg>f&JDZ<IRrz*F2lq8Q_NAYa4
zr>gtVvyBD02OjSV6!=E-vhb2h*=qer3I|)SJO<JSHQxmb8501ftLIrTTL2XnJ#kg*
zdyj$qZj>w%>>@UB%_0JC1GKmH0HVrWHBb~leB6=vFp350n{5fW+DPR=yL$%-+Scqr
zn;F*x@dYX6**TQXM4kRH4cY>(Z_wRrG|08VpA2ronXJE;MV*Y>4%`k%)Yy(H9JSMS
h>fHlwN4+Sq{{bP^yh}74A58!N002ovPDHLkV1n1Ut^xo6

literal 0
HcmV?d00001