Merge branch 'lzm_web'

src/views/badge/index.vue

@@ -110,10 +110,10 @@
     </div>
     <div class="tag-change-box" v-if="orderStat.use_type == 2">
       <div class="tag-change-item">
-        <div class="tag-change-item-title" :class="{ tagActive: prodId == 7 }" @click="prodId = 7">
+        <div class="tag-change-item-title" :class="{ tagActive: prodId == 7 }" @click="prodId = 7;picture = null">
           人物主体
         </div>
-        <div class="tag-change-item-title" :class="{ tagActive: prodId == 8 }" @click="prodId = 8">
+        <div class="tag-change-item-title" :class="{ tagActive: prodId == 8 }" @click="prodId = 8;picture = null">
           宠物主体
         </div>
       </div>

src/views/badge/preview.vue

@@ -117,6 +117,11 @@
       <div class="address-item">
         <van-address-edit
           :area-list="areaList"
+          show-delete
+          show-set-default
+          show-search-result
+          :search-result="searchResult"
+          :area-columns-placeholder="['请选择', '请选择', '请选择']"
           @change="nameTelChange"
           @change-area="changeArea"
           @change-detail="onChangeDetail"
@@ -190,28 +195,38 @@ function sureReload() {
     return
   }
   isPreview.value = false
-  group.value = newGroup.value
-  const params = {
-    pid: pid.value,
-    group: group.value,
-    prod_id: prodId.value
-  }
-  badgeApi.putModeling(params).then((res: any) => {
-    console.log('putModeling', res)
-    imageUrl.value = '';
-    imageList.value = []
-    imgKey.value = '';
-    createLog()
-  }).catch((err) => {
-    console.log('putModeling', err)
-    showReload.value = false
-    showToast({
-      message: err.message,
-      duration: 2000,
-    })
-  }).finally(() => {
-    showReload.value = false
+  showConfirmDialog({
+  title: '再次生成',
+  message:
+    '请确认是否重新生成。',
   })
+  .then(() => {
+    group.value = newGroup.value
+    const params = {
+      pid: pid.value,
+      group: group.value,
+      prod_id: prodId.value
+    }
+    badgeApi.putModeling(params).then((res: any) => {
+      console.log('putModeling', res)
+      imageUrl.value = '';
+      imageList.value = []
+      imgKey.value = '';
+      createLog()
+    }).catch((err) => {
+      console.log('putModeling', err)
+      showReload.value = false
+      showToast({
+        message: err.message,
+        duration: 2000,
+      })
+    }).finally(() => {
+      showReload.value = false
+    })
+  })
+  .catch(() => {
+    showReload.value = false
+  });
   
 }
 
@@ -1318,6 +1333,7 @@ onUnmounted(() => {
   z-index: 2;
   font-family: chinese;
   overflow: hidden;
+  text-shadow: 1px 0px 1px #000000a1;
 }
 .shape-item-image-round {
   border-radius: 50%;