feat: 过滤地址

.hbuilderx/launch.json

@@ -5,6 +5,10 @@
             "customPlaygroundType" : "local",
             "playground" : "custom",
             "type" : "uni-app:app-android"
+        },
+        {
+            "playground" : "standard",
+            "type" : "uni-app:app-ios"
         }
     ]
 }

manifest.json

@@ -3,7 +3,7 @@
     "appid" : "__UNI__4910728",
     "description" : "信任桥优品是一款集线上商城、线下联盟商家的DAO聚合商城；通过“有趣”“有利”“有希望”的卖货玩法，吸引消费者、推广者、商家、投资人参与生态，共同打造共创共享的全球产业生态。",
     "versionName" : "1.0.1",
-    "versionCode" : 134,
+    "versionCode" : 135,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -87,33 +87,33 @@
             },
             "icons" : {
                 "android" : {
-                    "hdpi" : "static/logo.png",
+                    "hdpi" : "unpackage/res/icons/72x72.png",
-                    "xhdpi" : "static/logo.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
-                    "xxhdpi" : "static/logo.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
-                    "xxxhdpi" : "static/logo.png"
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
                 },
                 "ios" : {
-                    "appstore" : "",
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
                     "ipad" : {
-                        "app" : "static/logo.png",
+                        "app" : "unpackage/res/icons/76x76.png",
-                        "app@2x" : "static/logo.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
-                        "notification" : "static/logo.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
-                        "notification@2x" : "static/logo.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "proapp@2x" : "static/logo.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
-                        "settings" : "static/logo.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
-                        "settings@2x" : "static/logo.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "spotlight" : "static/logo.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
-                        "spotlight@2x" : "static/logo.png"
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
                     },
                     "iphone" : {
-                        "app@2x" : "static/logo.png",
+                        "app@2x" : "unpackage/res/icons/120x120.png",
-                        "app@3x" : "static/logo.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
-                        "notification@2x" : "static/logo.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "notification@3x" : "static/logo.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
-                        "settings@2x" : "static/logo.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "settings@3x" : "static/logo.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
-                        "spotlight@2x" : "static/logo.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
-                        "spotlight@3x" : "static/logo.png"
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
                     }
                 }
             },
@@ -139,20 +139,6 @@
                     "pid" : "11931",
                     "parameters" : {}
                 }
-            },
-            "WITTestUniPlugin" : {
-                "__plugin_info__" : {
-                    "name" : "WITTestUniPlugin",
-                    "description" : "iOS原生插件",
-                    "platforms" : "iOS",
-                    "url" : "",
-                    "android_package_name" : "",
-                    "ios_bundle_id" : "",
-                    "isCloud" : false,
-                    "bought" : -1,
-                    "pid" : "",
-                    "parameters" : {}
-                }
             }
         }
     },

pages/login_package/login/login.vue

@@ -2,13 +2,7 @@
 	<view class="login_warp">
 		<view class="login_logo_warp">
 			<view style="text-align: center">
-        <up-image
+				<up-image src="/static/logo.png" width="90" height="118" bgColor="#f1f6ff00" radius="10"></up-image>
-          src="/static/logo.png"
-          width="90"
-          height="118"
-          bgColor="#f1f6ff00"
-          radius="10"
-        ></up-image>
 			</view>
 			<!-- <view style="margin-top: 20rpx;">
 				  <up-image src="/static/logo_z.png" width="100" height="40" bgColor="#f1f6ff00"></up-image>
@@ -16,59 +10,27 @@
 		</view>
 		<view class="login_info">
 			<view class="login_info_item">
-        <up-input
+				<up-input placeholder="请输入手机号/账户名称" border="surround" v-model="form.name" :customStyle="inputCss"
-          placeholder="请输入手机号/账户名称"
+					@change="checkNameParam"></up-input>
-          border="surround"
-          v-model="form.name"
-          :customStyle="inputCss"
-          @change="checkNameParam"
-        ></up-input>
 			</view>
 			<!-- 密码登录 -->
 			<view class="login_info_item" v-if="loginWay === 'password'">
-        <up-input
+				<up-input placeholder="请输入密码" border="surround" v-model="form.password" :customStyle="inputCss"
-          placeholder="请输入密码"
+					:type="isShow ? 'text' : 'password'" @change="checkParam">
-          border="surround"
-          v-model="form.password"
-          :customStyle="inputCss"
-          :type="isShow ? 'text' : 'password'"
-          @change="checkParam"
-        >
 					<template #suffix style="margin-right: 10rpx">
-            <up-image
+						<up-image v-if="isShow" src="/static/login/show.png" width="20" height="20" bgColor="#f1f6ff00"
-              v-if="isShow"
+							@click="isShow = false"></up-image>
-              src="/static/login/show.png"
+						<up-image v-else src="/static/login/hidden.png" width="20" height="20" bgColor="#f1f6ff00"
-              width="20"
+							@click="isShow = true"></up-image>
-              height="20"
-              bgColor="#f1f6ff00"
-              @click="isShow = false"
-            ></up-image>
-            <up-image
-              v-else
-              src="/static/login/hidden.png"
-              width="20"
-              height="20"
-              bgColor="#f1f6ff00"
-              @click="isShow = true"
-            ></up-image>
 					</template>
 				</up-input>
 			</view>
 			<!-- 验证码登录 -->
 			<view class="login_info_item" v-else>
-        <up-input
+				<up-input placeholder="请输入验证码" border="surround" v-model="form.code" :customStyle="inputCss">
-          placeholder="请输入验证码"
-          border="surround"
-          v-model="form.code"
-          :customStyle="inputCss"
-        >
 					<template #suffix style="margin-right: 10rpx">
 						<view v-if="countdown" class="code-warp">
-              <up-count-down
+							<up-count-down :time="60 * 1000" format="ss" @finish="countdown = false"></up-count-down>
-                :time="60 * 1000"
-                format="ss"
-                @finish="countdown = false"
-              ></up-count-down>
 							<text style="margin-left: 10rpx">s</text>
 						</view>
 						<view v-else @click="getMobileCode" class="code_msg">
@@ -82,12 +44,8 @@
 				<text style="margin-left: 10rpx">登录</text>
 			</view>
 			<view class="cut_way_warp">
-        <view v-if="loginWay === 'password'" @click="loginWay = 'code'"
+				<view v-if="loginWay === 'password'" @click="loginWay = 'code'">验证码登录</view>
-          >验证码登录</view
+				<view v-if="loginWay === 'code'" @click="loginWay = 'password'">密码登录登录</view>
-        >
-        <view v-if="loginWay === 'code'" @click="loginWay = 'password'"
-          >密码登录登录</view
-        >
 				<view @click="jumpForgot">忘记密码</view>
 				<view @click="jumpRegister">注册</view>
 			</view>
@@ -96,49 +54,26 @@
 			<view class="other_login">其他登录方式</view>
 			<view class="login_other_icon">
 				<view class="login_other_item" @click="wechatOneLogin">
-          <up-image
+					<up-image src="/static/login/WXICON.png" width="44" height="44" bgColor="#f1f6ff00"></up-image>
-            src="/static/login/WXICON.png"
-            width="44"
-            height="44"
-            bgColor="#f1f6ff00"
-          ></up-image>
 					微信登录
 				</view>
 				<!-- <view  class="login_other_item" @click="aa"> -->
 				<view v-if="!isIOS" class="login_other_item" @click="alipayOneLogin">
-          <up-image
+					<up-image src="/static/login/ZFB.png" width="44" height="44" bgColor="#f1f6ff00"></up-image>
-            src="/static/login/ZFB.png"
-            width="44"
-            height="44"
-            bgColor="#f1f6ff00"
-          ></up-image>
 					支付宝登录
 				</view>
 			</view>
 		</view>
 		<view class="policy_warp">
-      <up-checkbox
+			<up-checkbox name="isCheck" usedAlone v-model:checked="isPolicy" shape="circle" activeColor="#7934F6"
-        name="isCheck"
+				size="19" iconSize="18">
-        usedAlone
-        v-model:checked="isPolicy"
-        shape="circle"
-        activeColor="#7934F6"
-        size="19"
-        iconSize="18"
-      >
 				<template #label>
-          <text>已阅读并同意</text>
+					<text @click="aa">已阅读并同意</text>
-          <text class="policy_a_warp" @click="jumpUserAgreement"
+					<text class="policy_a_warp" @click="jumpUserAgreement">《服务协议》</text>
-            >《服务协议》</text
-          >
 					<text>、</text>
-          <text class="policy_a_warp" @click="jumpPrivacyAgreement"
+					<text class="policy_a_warp" @click="jumpPrivacyAgreement">《隐私政策》</text>
-            >《隐私政策》</text
-          >
 					<text>、</text>
-          <text class="policy_a_warp" @click="jumpProductAgreement"
+					<text class="policy_a_warp" @click="jumpProductAgreement">《售后保障协议》</text>
-            >《售后保障协议》</text
-          >
 				</template>
 			</up-checkbox>
 		</view>
@@ -148,9 +83,18 @@
 
 <script>
 	import InputCodeComm from "@/components/code-comm/code-comm.vue";
-import { SMS_TYPE } from "@/utils/enumUtils.js";
+	import {
-import { getUserList } from "@/api/common.js";
+		SMS_TYPE
-import { loginbysms, loginbypw, wechatLogin, alipayLogin } from "@/api/auth.js";
+	} from "@/utils/enumUtils.js";
+	import {
+		getUserList
+	} from "@/api/common.js";
+	import {
+		loginbysms,
+		loginbypw,
+		wechatLogin,
+		alipayLogin
+	} from "@/api/auth.js";
 	import {
 		setStorageFun,
 		TOKEN_NAME,
@@ -204,7 +148,6 @@ export default {
 			};
 		},
 		methods: {
-	  
 			aa() {
 				const nativiPlugin = uni.requireNativePlugin('WITTestUniPlugin');
 				console.log("隐藏原生tabbar", nativiPlugin)
@@ -445,8 +388,7 @@ export default {
 					return;
 				}
 
-      hyyAlipay.openAuthScheme(
+				hyyAlipay.openAuthScheme({
-        {
 						appId: "2021005183625053", // 支付宝分配给开发者的应用 ID
 						scheme: "trustbridgeapp", // manifest.json -> "App常用其他设置" -> "UrlSchemes"里设置
 					},

pages/mine_package/mine_address_add/mine_address_add.vue

@@ -245,9 +245,21 @@ export default {
 			if (!params.id || params.id === 0) {
 				delete params.id;
 			}
+			if (!params.townshipId || params.townshipId === 0) {
+				delete params.townshipId;
+			}
 			if (!params.areaId || params.areaId === 0) {
 				delete params.areaId;
 			}
+			if (!params.cityId || params.cityId === 0) {
+				delete params.cityId;
+			}
+			if (!params.provinceId || params.provinceId === 0) {
+				delete params.provinceId;
+			}
+			if (!params.countryId || params.countryId === 0) {
+				delete params.countryId;
+			}
 			delete params.regionStr;
 			const res = await editAddress(params);
 			if (res && res.bizcode === 100) {