Merge branch 'ymf' of https://newgitea.sxczgkj.cn/czg_team/cashier_app into new_gyq

pageMarket/superVip/components/config.vue

@@ -222,6 +222,12 @@ async function save() {
   console.log(form);
   const submitData = {
     ...form,
+    conditionList: conditionLists.value
+      .filter((v) => v.checked)
+      .map((v) => ({
+        code: v.code,
+        value: v.value,
+      })),
   };
   const res = await superVipStore.editConfig(submitData);
   uni.showToast({
@@ -244,6 +250,18 @@ function setForm(data) {
   if (data.rewardCount == -1) {
     isLimitCount.value = 1;
   }
+  console.log(data);
+
+  conditionLists.value = conditionLists.value.map((v) => {
+    const findItem = data.conditionList.find((cond) => cond.code == v.code);
+    if (findItem) {
+      v.value = findItem.value;
+      v.checked = true;
+    } else {
+      v.checked = false;
+    }
+    return v;
+  });
   Object.assign(form, data);
   console.log(form);
 }

pageMarket/superVip/vip-lv-add.vue

@@ -18,11 +18,11 @@
         />
       </view>
       <view class="u-m-t-16">
-        <view class="font-bold u-m-b-16">所需会员值</view>
+        <view class="font-bold u-m-b-16">所需成长值</view>
         <input
           v-model="form.experienceValue"
           :disabled="optiopns.index == 0 ? true : false"
-          placeholder="请输入所需会员值"
+          placeholder="请输入所需成长值"
           :placeholderStyle="placeholderStyle"
         />
       </view>
@@ -171,7 +171,7 @@ const form = reactive({
   remark: "",
 });
 function addCoupon() {
-  form.couponList.push({
+  form.cycleRewardCouponList.push({
     coupon: { id: null },
     num: "",
     title: "",
@@ -225,6 +225,13 @@ async function save() {
     });
     return false;
   }
+  if(form.remark.trim() == ""){
+    uni.showToast({
+      title: "请输入等级说明",
+      icon: "none",
+    });
+    return false;
+  }
   const submitForm = {
     ...form,
   };