From 037e8b0d322571a6aa2dbb526ad078b2bcfe0b8a Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Sun, 25 Jun 2023 17:47:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?improve:=20=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E5=A4=96=E9=93=BE=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/linkaddress/index.vue      | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/template/admin/src/components/linkaddress/index.vue b/template/admin/src/components/linkaddress/index.vue
index 540dcf459..879699692 100644
--- a/template/admin/src/components/linkaddress/index.vue
+++ b/template/admin/src/components/linkaddress/index.vue
@@ -269,15 +269,19 @@
                   </Radio>
                 </RadioGroup>
               </div>
-              <FormItem label="跳转路径：" prop="url" v-if="customdate.status == 1">
-                <Input v-model="customdate.url" placeholder="请输入正确跳转路径"></Input>
-              </FormItem>
-              <FormItem label="APPID：" prop="appid" v-if="customdate.status == 2">
-                <Input v-model="customdate.appid" placeholder="请输入正确APPID"></Input>
-              </FormItem>
-              <FormItem label="小程序路径：" prop="mpUrl" v-if="customdate.status == 2">
-                <Input v-model="customdate.mpUrl" placeholder="请输入正确小程序路径"></Input>
-              </FormItem>
+              <template v-if="customdate.status == 1">
+                <FormItem label="跳转路径：" prop="url">
+                  <Input v-model="customdate.url" placeholder="请输入正确跳转路径"></Input>
+                </FormItem>
+              </template>
+              <template v-if="customdate.status == 2">
+                <FormItem label="APPID：" prop="appid">
+                  <Input v-model="customdate.appid" placeholder="请输入正确APPID"></Input>
+                </FormItem>
+                <FormItem label="小程序路径：" prop="mpUrl">
+                  <Input v-model="customdate.mpUrl" placeholder="请输入正确小程序路径"></Input>
+                </FormItem>
+              </template>
             </Form>
           </div>
         </div>
@@ -419,6 +423,7 @@ export default {
       ruleValidate: {
         name: [{ required: true, message: '请输入链接名称', trigger: 'blur' }],
         url: [{ required: true, message: '请输入跳转路径', trigger: 'blur' }],
+        appid: [{ required: true, message: '请输入APPID', trigger: 'blur' }],
       },
     };
   },

From 0a0d04ef349c17004a0b223f714718034b461dea Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Sun, 25 Jun 2023 17:50:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?style:=20=E5=9C=B0=E5=9D=80=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/uni-app/pages/goods/order_confirm/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/uni-app/pages/goods/order_confirm/index.vue b/template/uni-app/pages/goods/order_confirm/index.vue
index 403fecdc1..3a92c7728 100644
--- a/template/uni-app/pages/goods/order_confirm/index.vue
+++ b/template/uni-app/pages/goods/order_confirm/index.vue
@@ -37,7 +37,7 @@
 					<view class='addressCon' v-else>
 						<view class='setaddress'>{{$t(`设置收货地址`)}}</view>
 					</view>
-					<view class='iconfont icon-jiantou'></view>
+					<view v-if="store_self_mention && is_shipping" class='iconfont icon-jiantou'></view>
 				</view>
 				<view class='address acea-row row-between-wrapper' v-else @tap="showStoreList">
 					<block v-if="storeList.length>0">