【金掌桂2022年开门红需求】选择产品弹框-开门红版UI样式修改

src/views/ebiz/common/SelectedProduct.vue

@@ -33,14 +33,14 @@
       </div>
     </div>
 
-    <!-- <van-dialog v-model="active_show" :show-confirm-button="false" class="dialog_class" style="position: relative; overflow: visible;">
+    <van-dialog v-model="active_show" :show-confirm-button="false" class="dialog_class" style="position: relative; overflow: visible;">
       <img class="icon_image" src="@/assets/images/kmh/close_bg.png" @click="active_show = false" />
       <div class="pl20 pr20 mt30">
-        <div class="flex justify-content-c align-items-c">
+        <!-- <div class="flex justify-content-c align-items-c">
           <img class="icon_title_image" src="@/assets/images/kmh/title_bg.png" />
-        </div>
-        <van-radio-group v-model="active_radio" style="align-items: center;padding-top: 20px">
-          <van-radio name="1" class="radio_class ml60">
+        </div> -->
+        <van-radio-group v-model="active_radio" style="align-items: center;padding-top: 140px">
+          <van-radio name="1" class="radio_class ml50">
             <template #icon="props">
               <img class="img-icon radio_icon_image" :src="props.checked ? checkedUrl : noCheckedUrl" />
             </template>
@@ -48,7 +48,7 @@
               <img class="icon_select_image" src="@/assets/images/kmh/kmh_pro.png" />
             </div>
           </van-radio>
-          <van-radio name="2" class="radio_class ml60">
+          <van-radio name="0" class="radio_class ml50">
             <template #icon="props">
               <img class="img-icon radio_icon_image" :src="props.checked ? checkedUrl : noCheckedUrl" />
             </template>
@@ -58,11 +58,12 @@
           </van-radio>
         </van-radio-group>
         <div class="flex justify-content-c align-items-c click_buttons">
-          <img class="icon_click_image" src="@/assets/images/kmh/click_bg.png" @click="comfirmCheckActive('KMH')" /> -->
+          <img class="icon_click_image" src="@/assets/images/kmh/click_bg.png" @click="comfirmCheckActive('KMH')" />
+          <!-- <img class="icon_click_image" src="@/assets/images/kmh/click_bg.png" @click="comfirmCheckActive('KMH')" /> -->
           <!--<van-button type="danger" class="dialog-comfirm-button" @click="comfirmCheckActive" v-no-more-click="1000">确认</van-button>-->
-        <!-- </div>
+        </div>
       </div>
-    </van-dialog> -->
+    </van-dialog>
     <van-dialog v-model="active_sqy_show" :show-confirm-button="false" style="overflow: visible;">
       <img class="icon_image_close" src="@/assets/images/kmh/close_bg.png" @click="active_sqy_show = false" />
       <div class="pl20 pr20 mt30 mb10">
@@ -100,7 +101,7 @@
         <div class="flex justify-content-c align-items-c click_buttons">
           <!--<img class="icon_click_image" src="@/assets/images/kmh/click_bg.png" @click="comfirmCheckActive" />-->
           <!-- <van-button type="danger" class="dialog-comfirm-button" @click="comfirmCheckActive('SQY')" v-no-more-click="1000">确认</van-button> -->
-          <van-button type="danger" class="dialog-comfirm-button" @click="comfirmCheckActive()" v-no-more-click="1000">确认</van-button>
+          <van-button type="danger" class="dialog-comfirm-button" @click="comfirmCheckActive('PRODUCT')" v-no-more-click="1000">确认</van-button>
         </div>
       </div>
     </van-dialog>
@@ -469,15 +470,19 @@ export default {
         if (resultData.result == 0) {
           if (resultData.content.length) {
             this.activityList = [
-               {
-                activityCode:'',
-                activityName:'普通产品',
-                isKmh:'',
-                cvaildateStr:'',
-               }
-            ]
-            this.activityList = this.activityList.concat(resultData.content)
-            this.active_sqy_show = true
+                {
+                  activityCode:'',
+                  activityName:'普通产品',
+                  isKmh:'',
+                  cvaildateStr:'',
+                }
+              ]
+              this.activityList = this.activityList.concat(resultData.content)
+            if(resultData.content[0].isKmh == 'KMH'){
+              this.active_show = true
+            }else{
+              this.active_sqy_show = true  //代表其他产品
+            }           
             return
           }
           //正常后续跳转流程
@@ -497,20 +502,35 @@ export default {
       })
     },
     //选择活动还是普通产品，弹框确认按钮
-    // comfirmCheckActive(type) {
-    comfirmCheckActive() {
-      let param = {
-        orderDTO: {
-          orderInfoDTO: {
-            orderNo: this.$CacheUtils.getLocItem('orderNo'),
-            activeType: this.activityList[this.active_sqy_radio].isKmh,
-            activityCode: this.activityList[this.active_sqy_radio].activityCode,
-            cvaliDate : this.activityList[this.active_sqy_radio].cvaildateStr
-            // activeType: type=='KMH'?this.active_radio == '1'?'KMH':'':type=='SQY'?this.active_sqy_radio=='1'?'SQY':'':''
+    comfirmCheckActive(type) {
+      let param
+      if(type == 'KMH'){
+        param = {
+          orderDTO: {
+            orderInfoDTO: {
+              orderNo: this.$CacheUtils.getLocItem('orderNo'),
+              activeType: this.activityList[this.active_radio].isKmh,
+              activityCode: this.activityList[this.active_radio].activityCode,
+              cvaliDate : this.activityList[this.active_radio].cvaildateStr
+              // activeType: type=='KMH'?this.active_radio == '1'?'KMH':'':type=='SQY'?this.active_sqy_radio=='1'?'SQY':'':''
+            }
+          }
+        }
+      }else{
+        param = {
+          orderDTO: {
+            orderInfoDTO: {
+              orderNo: this.$CacheUtils.getLocItem('orderNo'),
+              activeType: this.activityList[this.active_sqy_radio].isKmh,
+              activityCode: this.activityList[this.active_sqy_radio].activityCode,
+              cvaliDate : this.activityList[this.active_sqy_radio].cvaildateStr
+              // activeType: type=='KMH'?this.active_radio == '1'?'KMH':'':type=='SQY'?this.active_sqy_radio=='1'?'SQY':'':''
+            }
           }
         }
       }
       
+      
       // 获取订单活动信息
       saveOrderActiveType(param).then(res => {
         this.active_show = false
@@ -587,7 +607,7 @@ export default {
   }
   .radio_class {
     height: 47px;
-    margin-bottom: 26px;
+    margin-bottom: 10px;
   }
   .dialog-comfirm-button {
     width: 167px;
@@ -601,8 +621,8 @@ export default {
     width: 19px;
     height: 19px;
     position: absolute;
-    right: 26px;
-    top: -22px;
+    right: 15px;
+    top: -30px;
   }
   .icon_image_close {
     width: 19px;
@@ -635,7 +655,7 @@ export default {
   }
   .click_buttons {
     padding-top: 5px;
-    padding-right: 10px;
+    padding-right: 0px;
     padding-bottom: 10px;
   }
 }