提交

src/view/SilkRoadSpringFestivalGala/pages/eight.vue

@@ -33,7 +33,7 @@
       </van-col>
     </van-row>
     <van-row style="background: #fff">
-      <van-col span="12">
+      <van-col span="8">
         <van-button
           class="btns"
           color="#eeb562"
@@ -47,7 +47,7 @@
           进店逛逛
         </van-button>
       </van-col>
-      <van-col span="12">
+      <van-col span="8">
         <van-button
           color="#eeb562"
           class="btns"
@@ -59,6 +59,20 @@
           我的奖品
         </van-button>
       </van-col>
+      <van-col span="8">
+        <van-button
+          class="btns"
+          color="#eeb562"
+          round
+          plain
+          hairline
+          size="small"
+          type="primary"
+          @click="addressObjshow"
+        >
+          我的地址
+        </van-button>
+      </van-col>
     </van-row>
     <van-notice-bar
       color="#000000"
@@ -81,25 +95,37 @@
       />
     </div>
 
+    <van-dialog
+      v-model:show="addressObj.show"
+      :before-close="upaddress"
+      title="我的地址"
+      teleport="#app"
+    >
+      <van-cell-group inset>
+        <van-field v-model="nickName" label="昵称" />
+        <van-field disabled v-model="phone" type="tel" label="手机号" />
+        <van-field
+          v-model="address"
+          rows="1"
+          autosize
+          label="地址"
+          type="textarea"
+          placeholder="请输入地址"
+        />
+      </van-cell-group>
+    </van-dialog>
+
     <van-dialog
       :before-close="before"
       v-model:show="gift.show"
-      :title="'获得'+gift.name"
+      :title="'获得' + gift.name"
+      teleport="#app"
       show-cancel-button
     >
       <img :src="show.url" style="width: 5em" />
-      <van-field
-        required
-        v-model="address"
-        label="地址"
-        placeholder="请输入地址"
-      />
-      <van-field
-        required
-        v-model="nickName"
-        label="昵称"
-        placeholder="请输入昵称"
-      />
+      <p>
+        恭喜你中奖，请于1月4日前，在右下角“我的地址”中上传收货地址哦~
+      </p>
     </van-dialog>
   </div>
 </template>
@@ -122,6 +148,7 @@ let w = window.$originData.orginParames.availWidth || 0;
 const show = ref(Array(12).fill(false));
 const address = ref(localStorage.getItem("silkRoadAddress") || "");
 const nickName = ref(localStorage.getItem("silkRoadName") || "");
+const phone = ref(localStorage.getItem("silkRoadPhone") || "");
 const next = false;
 const emits = defineEmits(["showVideo", "showTitleFunc"]);
 let t = setInterval(() => {
@@ -143,16 +170,15 @@ let T = undefined;
 const gift = ref({});
 let isdraw = false;
 function draw() {
-  const phone = localStorage.getItem("silkRoadPhone");
-  if (!phone) return emits("showTitleFunc");
+  phone.value = localStorage.getItem("silkRoadPhone") || "";
+  if (!phone.value) return emits("showTitleFunc");
   if (T) clearTimeout(T);
   T = setTimeout(() => {
     getDrawOri({
-      phone,
+      phone: phone.value,
       code: window.$shanshipin && window.$shanshipin.UserId ? 76767676 : "",
     }).then(res => {
       const r = res || {};
-      console.log("-------->", r);
       isdraw = r.prizeId !== 1; // 接入接口后直接由接口提供是否中将
       if (!isdraw)
         return showDialog({
@@ -169,21 +195,36 @@ function draw() {
 
 function before(type) {
   if (type !== "confirm" || !isdraw) return true;
+  showToast("奖品已打包，静等您收货哦！");
+  return true;
+}
+
+const addressObj = ref({ show: false });
+
+function upaddress() {
+  if (!address.value) return;
   getUpdateOri({
-    phone: localStorage.getItem("silkRoadPhone"),
+    phone: phone.value,
     userName: nickName.value,
     addr: address.value,
-  }).then(() => {
-    localStorage.setItem("silkRoadAddress", address.value);
-    localStorage.setItem("silkRoadName", nickName.value);
-    showToast("奖品已打包，静等您收货哦！");
-  });
-  return true;
+  })
+    .then(() => {
+      localStorage.setItem("silkRoadAddress", address.value);
+      localStorage.setItem("silkRoadName", nickName.value);
+      addressObj.value.show = false;
+    })
+    .catch(() => {
+      addressObj.value.show = false;
+    });
+}
+function addressObjshow() {
+  if (!phone.value) return showToast("请登录后在查看");
+  addressObj.value.show = true;
 }
 
 function mygift() {
   getGiftList({
-    phone: localStorage.getItem("silkRoadPhone"),
+    phone: phone.value,
   }).then(r => {
     const giftList = r || [];
     const cardList = [];
@@ -230,7 +271,7 @@ defineExpose({
   .btns {
     margin: 0 auto;
     display: block;
-    width: 10em;
+    width: 8em;
   }
   .headText {
     text-align: center;
@@ -326,6 +367,7 @@ defineExpose({
 
   .vieoPlay {
     position: relative;
+    font-size: 0;
 
     .play {
       position: absolute;

src/view/SilkRoadSpringFestivalGala/pages/six.vue

@@ -106,7 +106,7 @@
           <seven />
         </div>
       </van-swipe-item> -->
-      <van-swipe-item style="overflow: auto;height: 100vh">
+      <van-swipe-item style="overflow: auto; height: 100vh">
         <eight
           ref="eightRef"
           @showTitleFunc="showTitleFunc"
@@ -309,21 +309,18 @@ function closeTitle(type) {
   getStore({
     phone: from.phone,
     verifyCode: from.code,
-  })
-    .then(r => {
-      localStorage.setItem("silkRoadPhone", from.phone);
-      localStorage.setItem("silkRoadCode", from.code);
-      localStorage.setItem("silkRoadName", from.name);
-      localStorage.setItem("silkRoadToken", r.token);
-      isCode.value = 0;
-      showTitle.value = false;
-      // 调用子组件抽奖
-      eightRef.value.draw();
-      return true;
-    })
-    .catch(() => {
-      return false;
-    });
+  }).then(r => {
+    localStorage.setItem("silkRoadPhone", from.phone);
+    localStorage.setItem("silkRoadCode", from.code);
+    localStorage.setItem("silkRoadName", from.name);
+    localStorage.setItem("silkRoadToken", r.token);
+    isCode.value = 0;
+    showTitle.value = false;
+    console.log(showTitle.value);
+    // 调用子组件抽奖
+    eightRef.value.draw();
+  });
+  return true;
 }
 
 function showDown(type) {