s

client/components/dialog/prize-dialog/prize-dialog.axml

@@ -13,8 +13,11 @@
               size="large"
               class="probability-prize-content-formItem" 
               label="是否降级奖品"
-              validateState="{{nameTips.status}}" help="{{nameTips.content}}"
               required>
+              <radio-group value="{{prizeInitData.isBackUp}}" onChange="onswitchIsBackUpChange">
+                <radio value="{{true}}">是</radio>
+                <radio value="{{false}}">否</radio>
+              </radio-group>
             </form-item>
           <form-item  style="width:100%" size="large" class="probability-prize-content-formItem" label="奖品类型" required>
             <view class="probability-prize-content-formitem-choosePrize-wrap">

client/components/dialog/prize-dialog/prize-dialog.js

@@ -24,6 +24,7 @@ const INIT_DATA = {
   probability: "",
   name: "",
   switchStock: STOCK_NO_LIMIT,
+  isBackUp: false,
   useStock: 0,
   rank: "",
   amount: "",
@@ -94,6 +95,7 @@ Component({
       probability: "",
       name: "",
       switchStock: STOCK_NO_LIMIT,
+      isBackUp: false,
       useStock: 0,
       rank: "",
       amount: "",
@@ -230,6 +232,7 @@ Component({
         credits: "",
         probability: "",
         name: "",
+        isBackUp: false,
         switchStock: STOCK_NO_LIMIT,
       };
       if (type !== value) {
@@ -276,6 +279,13 @@ Component({
         },
       });
     },
+    onswitchIsBackUpChange(e){
+      this.setData({
+        prizeInitData:{
+          isBackUp: e.detail.value
+        }
+      })
+    },
     async uploadImage() {
       try {
         this.setData({
@@ -353,6 +363,7 @@ Component({
         credits,
         useStock,
         switchStock,
+        isBackUp,
         endTime,
         rank,
         itemId,
@@ -543,6 +554,7 @@ Component({
           useStock: +useStock,
           rank,
           switchStock,
+          isBackUp,
           prizeDataType:+prizeDataType,
           itemId,
           amount,

client/components/dialog/rank-dialog/rank-dialog.acss

@@ -22,9 +22,7 @@
   align-items: center;
 }
 .rank-dialog-wrap .operator-btns {
-  margin-bottom: 15px;
-  width: 300px;
-  float: right;
+  margin-bottom: 10px;
 }
 .rank-dialog-wrap .long-item .next-select {
   width: 150px;

client/components/dialog/rank-dialog/rank-dialog.axml

@@ -79,7 +79,7 @@
           <view  a:if="{{x.record.type == 3}}">
             <view>{{(x.record.receiveName || '')}}</view>
             <view>{{( x.record.phone || '')}} </view>
-            <view>{{ ( x.record.province + x.record.city + x.record.area + x.record.addressdetail || '') }}</view>
+            <view>{{ ( x.record.province + x.record.city + x.record.area + x.record.streetName + x.record.addressDetail || '') }}</view>
             <view a:if="{{!x.record.receiveName}}">暂未填写</view>
           </view>
         <view a:else>/</view>

server/duibats/src/controller/awards.controller.ts

@@ -117,7 +117,7 @@ export default class BaseController {
         if (v.prizeDataType == 2) prizeDataType = '排行榜'
         if (v.prizeDataType == 3) prizeDataType = '分享获得'
 
-        if (v.type == PRIZE_TYPE.EQUITY) prizeType = '实物'
+        if (v.type == PRIZE_TYPE.EQUITY) prizeType = '优惠券'
         if (v.type == PRIZE_TYPE.CREDITS) prizeType = '积分'
         if (v.type == PRIZE_TYPE.OBJECT) {
           prizeType = '实物'
@@ -137,7 +137,7 @@ export default class BaseController {
         v.type == 2 ? `${v.credits || 0}积分` : v.name || '',
         v.type == 3 ? v.receiveName || '' : '/',
         v.type == 3 ? (v.phone ? v.phone + '' : '暂未填写') : '/',
-        v.type == 3 ? v.province + v.city + v.area + v.addressdetail || '暂未填写' : '/',
+        v.type == 3 ? v.province + v.city + v.area + v.streetName + v.addressDetail || '暂未填写' : '/',
         shipTxt,
         v.type == 3 ? v.shipCompany || '' : '/',
         v.type == 3 ? (v.shipNum ? v.shipNum + '' : '') : '/'

server/duibats/src/service/awards.service.ts

@@ -88,9 +88,9 @@ export default class AwardsService {
     let c = startTime > 0 && endTime > 0 ? { createTime: { $gt: startTime, $lt: endTime } } : null
     let s = shipStatus
       ? (shipStatus == 1
-        ? { shipStatus: { $in: [SHIP_STATUS.NO_ADDRESS, SHIP_STATUS.NO_SHIP, SHIP_STATUS.HAS_SHIP] } }
+        ? { shipStatus: { $in: [SHIP_STATUS.NO_ADDRESS] } }
         : (shipStatus == 2
-          ? { shipStatus: { $in: [SHIP_STATUS.NO_ADDRESS, SHIP_STATUS.NO_SHIP] } }
+          ? { shipStatus: { $in: [SHIP_STATUS.NO_SHIP] } }
           : { shipStatus: SHIP_STATUS.HAS_SHIP }
         )
       )