购物车定制项优化

packageA/contract/modules/discount/type/index.wxml

@@ -10,4 +10,4 @@
     </view>
 </view>
 <List list='{{list}}' disabled='{{disabled}}' bind:deleteItem='deleteItems' bindchangeQueue='changeQueue' />
-<synchronous id="synchronous" bind:confirm='confirm' />
+<synchronous id="synchronous" type='类别' bind:confirm='confirm' />

packageA/contract/modules/product/synchronous/index.js

@@ -2,6 +2,10 @@ Component({
     properties: {
         confirm: {
             type: Function
+        },
+        type: {
+            type: String,
+            value: "明细"
         }
     },
     data: {

packageA/contract/modules/product/synchronous/index.scss

@@ -9,7 +9,6 @@
 }
 
 .explain {
-    width: 588rpx;
     height: 34rpx;
     font-size: 24rpx;
     font-family: PingFang SC, PingFang SC;

packageA/contract/modules/product/synchronous/index.wxml

@@ -1,27 +1,56 @@
 <van-popup show="{{ show }}" position="bottom" z-index='99999999'>
-    <view class="title">
-        同步合作协议
-    </view>
-    <view class="explain">
-        请选择同步更新经销商/直销客户合作协议产品的方式：
-    </view>
-    <van-radio-group value="{{ radio }}">
-        <view class="item" bindtap="changeRadio" data-name="1">
-            <view class="label">
-                <van-radio icon-size='16px' name="1" />同步添加合作协议产品
-            </view>
-            <view class="value">将协议中所有产品添加到表体，若表体已存在产品，则协议中相同产品的信息及其折扣价格覆盖更新到表体。</view>
+    <block wx:if="{{type == '明细'}}">
+        <view class="title">
+            同步合作协议
         </view>
-        <view class="item" bindtap="changeRadio" data-name="0">
-            <view class="label">
-                <van-radio icon-size='16px' name="0" />仅更新合作协议的产品折扣价格
-            </view>
-            <view class="value">将协议中与表体相同的产品信息及其折扣价格覆盖更新到表体，不添加协议产品。</view>
+        <view class="explain">
+            请选择同步更新经销商/直销客户合作协议产品的方式：
         </view>
+        <van-radio-group value="{{ radio }}">
+            <view class="item" bindtap="changeRadio" data-name="1">
+                <view class="label">
+                    <van-radio icon-size='16px' name="1" />同步添加合作协议产品
+                </view>
+                <view class="value">将协议中所有产品添加到表体，若表体已存在产品，则协议中相同产品的信息及其折扣价格覆盖更新到表体。</view>
+            </view>
+            <view class="item" bindtap="changeRadio" data-name="0">
+                <view class="label">
+                    <van-radio icon-size='16px' name="0" />仅更新合作协议的产品折扣价格
+                </view>
+                <view class="value">将协议中与表体相同的产品信息及其折扣价格覆盖更新到表体，不添加协议产品。</view>
+            </view>
 
-        <view class="button-box">
-            <van-button custom-class='but cancel' disabled='{{loading}}' bindtap="onCancel">取消</van-button>
-            <van-button custom-class='but confirm' loading='{{loading}}' loading-text='保存中...' bindtap="onConfirm">确定</van-button>
+            <view class="button-box">
+                <van-button custom-class='but cancel' disabled='{{loading}}' bindtap="onCancel">取消</van-button>
+                <van-button custom-class='but confirm' loading='{{loading}}' loading-text='保存中...' bindtap="onConfirm">确定</van-button>
+            </view>
+        </van-radio-group>
+    </block>
+    <block wx:elif="{{type == '类别'}}">
+        <view class="title">
+            同步合作协议
         </view>
-    </van-radio-group>
+        <view class="explain">
+            请选择同步更新经销商/直销客户合作协议产品类别及折扣的方式：
+        </view>
+        <van-radio-group value="{{ radio }}">
+            <view class="item" bindtap="changeRadio" data-name="1">
+                <view class="label">
+                    <van-radio icon-size='16px' name="1" />同步添加合作协议产品类别及其折扣
+                </view>
+                <view class="value">将协议中所有产品类别及其折扣添加到表体，若表体已存在产品类别，则协议中相同产品类别及其折扣价格覆盖更新到表体。</view>
+            </view>
+            <view class="item" bindtap="changeRadio" data-name="0">
+                <view class="label">
+                    <van-radio icon-size='16px' name="0" />仅更新合作协议的产品类别折扣
+                </view>
+                <view class="value">将协议中与表体相同的产品类别的折扣覆盖更新到表体，不添加协议的产品类别。</view>
+            </view>
+
+            <view class="button-box">
+                <van-button custom-class='but cancel' disabled='{{loading}}' bindtap="onCancel">取消</van-button>
+                <van-button custom-class='but confirm' loading='{{loading}}' loading-text='保存中...' bindtap="onConfirm">确定</van-button>
+            </view>
+        </van-radio-group>
+    </block>
 </van-popup>

packageA/offers/detail.js

@@ -265,7 +265,7 @@ Page({
                 label: "审核"
             });
         }
-        if (['审核', '复核'].includes(status) && this.data.options.some(v => v == 'isrecheck')) tabbarList.unshift(status == '审核' ? {
+        if (this.data.detail.specialoffer == 1 && ['审核', '复核'].includes(status) && this.data.options.some(v => v == 'isrecheck')) tabbarList.unshift(status == '审核' ? {
             icon: "icon-fuhe",
             label: "复核"
         } : {
@@ -542,7 +542,7 @@ Page({
                     if (res.confirm) _Http.basic({
                         "id": 20231206102404,
                         "content": {
-                            "sa_quotedpriceid": detail.sa_quotedpriceid,
+                            "sa_quotedpriceid": data.sa_quotedpriceid,
                             isrecheck
                         }
                     }).then(res => {
@@ -550,7 +550,7 @@ Page({
                             title: res.msg == '成功' ? `${ isrecheck ? '复核' : '反复核'}成功` : res.msg,
                             icon: "none"
                         })
-                        if (res.msg == '成功') this.getDetail(true)
+                        if (res.msg == '成功') that.getDetail(true)
                     })
                 }
             })