Merge branch 'master' of gitlab.aodianyun.com:activities/web-lottery into feature/zwczb

CHANGELOG.md

@@ -2,6 +2,34 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.3.6](https://gitlab.aodianyun.com/activities/web-lottery/compare/v1.3.5...v1.3.6) (2023-04-12)
+
+
+### Features
+
+* 交互优化 ([eed16ee](https://gitlab.aodianyun.com/activities/web-lottery/commit/eed16eeec34a80771f7979c857b7cc0a7b48c117))
+* 交互优化 ([017c6b1](https://gitlab.aodianyun.com/activities/web-lottery/commit/017c6b196ff435fdcca29da9b928bff5a5f0961e))
+* 优化中奖信息 ([1cb519b](https://gitlab.aodianyun.com/activities/web-lottery/commit/1cb519b8619c8d8a679f8fc0fa148da1faf1048d))
+
+### [1.3.5](https://gitlab.aodianyun.com/activities/web-lottery/compare/v1.3.4...v1.3.5) (2023-01-10)
+
+
+### Features
+
+* 样式优化 ([64b16bf](https://gitlab.aodianyun.com/activities/web-lottery/commit/64b16bf64ba0a15caa8380325bd84d1af7ae3757))
+
+### [1.3.4](https://gitlab.aodianyun.com/activities/web-lottery/compare/v1.3.3...v1.3.4) (2023-01-10)
+
+
+### Features
+
+* 抽奖信息同步后台 ([8cf648e](https://gitlab.aodianyun.com/activities/web-lottery/commit/8cf648e306266ab63364f726c63a94658f477d4a))
+* 更新config ([d3349d0](https://gitlab.aodianyun.com/activities/web-lottery/commit/d3349d0235c5534b79a9a9574f25c842a9174e87))
+* 新增中奖说明 ([0c98f18](https://gitlab.aodianyun.com/activities/web-lottery/commit/0c98f182496df0712dbabde268b4157a27dd7ef3))
+* 新增中奖说明 ([a00f565](https://gitlab.aodianyun.com/activities/web-lottery/commit/a00f565c0ce4997d01ecdeda8148635836e66367))
+* 展示优化 ([0514277](https://gitlab.aodianyun.com/activities/web-lottery/commit/0514277e5911c61b1e3f5feadbdbcfbb03167134))
+* 中奖详情优化 ([17edb7d](https://gitlab.aodianyun.com/activities/web-lottery/commit/17edb7d525e39b6901b64a41b92f3145e32a70fb))
+
 ### [1.3.3](https://gitlab.aodianyun.com/activities/web-lottery/compare/v1.3.2...v1.3.3) (2022-11-03)
 
 

package.json

 {
   "name": "web-lottery",
-  "version": "1.3.3",
+  "version": "1.3.6",
   "private": true,
   "license": "UNLICENSED",
   "scripts": {

pages/message/index.vue

@@ -43,15 +43,30 @@
           <template v-if="winInfo.exchangeType === LOTTERY_EXCHANGE_TYPE.offline">
             前往<span @click="openRecordHandler">抽奖记录</span>使用兑换码进行兑换
           </template>
-          <!-- 实物 邮寄 -->
-          <template v-if="winInfo.exchangeType === LOTTERY_EXCHANGE_TYPE.mailing && !winInfo.address">
-            填写<span @click="openAddressHandler">收货地址</span>等待官方邮寄
-          </template>
           <!-- 虚拟物品 -->
           <!-- <template v-if="lotteryInfo.prizeType === LOTTERY_MESSAGE_PRIZE_TYPE.online"
             >已进入您<span @click="openWalletHandler">个人中心-钱包</span>请查收</template
           > -->
         </div>
+        <div
+          v-if="winInfo.exchangeType === LOTTERY_EXCHANGE_TYPE.mailing"
+          class="lottery-message__rules"
+          @click="openAddressHandler"
+        >
+          <p class="lottery-message__rules-title">收货地址：</p>
+          <div class="lottery-message__rules-content">
+            <div>
+              <div v-if="!winInfo.address">请填写<span> 收货地址 </span>等待官方邮寄</div>
+              <div v-else>
+                <div class="title">{{ winInfo.name }} {{ winInfo.contactPhone }}</div>
+                <div class="adress">{{ winInfo.address }}</div>
+              </div>
+            </div>
+            <!-- <div class="img"> -->
+            <img v-if="!winInfo.address" src="./img/right.png" alt="" />
+            <!-- </div> -->
+          </div>
+        </div>
         <div class="lottery-message__rules">
           <p class="lottery-message__rules-title">中奖说明：</p>
           <div class="lottery-message__rules-content">{{ lotteryInfo.winningInstructions }}</div>
@@ -137,6 +152,11 @@ export default {
           contactPhone: addressInfo?.mobile || '',
           name: addressInfo?.name || ''
         }
+        this.winInfo = { ...this.winInfo, 
+          address: `${addressInfo?.province || ''}-${addressInfo?.city || ''}-${addressInfo?.area || ''}-${addressInfo?.detail}`, 
+          contactPhone: addressInfo?.mobile || '',
+          name: addressInfo?.name || ''
+        }
         setLotteryAddress(params).then(res => {
           const { code, errorCode, errorMessage } = res
           if (code === 200 && errorCode === 0) {
@@ -214,6 +234,9 @@ export default {
       })
     },
     openAddressHandler() {
+      if (this.winInfo.address) {
+        return
+      }
       // 触发打开编辑地址
       this.connection.emit('openAddressHandler', this.lotteryInfo)
     },
@@ -305,8 +328,8 @@ export default {
     color: #ff2a2a;
   }
   &__rules {
-    width: 100%;
-    margin-top: 20px;
+    width: 90%;
+    margin-top: 8px;
     max-height: 100px;
     overflow: hidden;
     overflow-y: auto;
@@ -315,13 +338,41 @@ export default {
     padding: 10px;
     font-size: 12px;
     color: #666;
+    font-family: PingFangSC-Regular, PingFang SC;
+    color: #666666;
+    line-height: 18px;
+    span {
+      color: #0091ff;
+    }
   }
   &__rules-title {
-    color: #333;
+    font-size: 12px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #333333;
   }
   &__rules-content {
-    margin-top: 5px;
-    line-height: 16px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-top: 8px;
+    img {
+      width: 16px;
+      height: 16px;
+    }
+    .title {
+      font-size: 12px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      font-weight: 400;
+      color: #333333;
+    }
+    .adress {
+      margin-top: 5px;
+      font-size: 12px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      font-weight: 400;
+      color: #666666;
+    }
   }
   &__keywords {
     color: #0091ff;