完整版解决冲突

src/pages/home/index.vue

@@ -43,7 +43,7 @@
     <view class="home_con u-m-t-20">
       <view class="home_con_tit">
         <view>
-          <span class="u-font-32">潜在客户</span>
+          <span class="u-font-32" @click="pay">潜在客户</span>
           <span class="u-m-l-10 color_000 u-font-24">MY ORDER</span>
         </view>
         <!--				<view class="u-font-24 color_d5aa7a">查看更多</view>-->
@@ -160,6 +160,92 @@ export default {
     }
   },
   methods: {
+    pay(){
+      const jyAliPay = uni.requireNativePlugin('JY-ALIPAY')
+      uni.showToast({
+        title: '开始',
+        complete(){
+
+          jyAliPay.show({ // 发起支付
+            if_sanbox:true,
+            auto_create_order_info:false,
+            appid:'',
+            rsa2_private:"",
+            order_info:  {
+              "charset": "UTF-8",
+              "method": "alipay.trade.wap.pay",
+              "sign": "NWYSVaKc1hnFm1QL%2BLhUT4WdTglbyv94FeLlEa7%2BXYADec99w6F%2FvxgfTLXAd4%2BviDDuC4cdHOh7mtxDIJruqImXorRwls5DUa2u3nRPe%2BnbplJ8hbmPlqBZEJw1zWO5ND%2FXH4ANQw%2BBKQrhr6adghH0g%2BkxT2X%2Bs%2B%2FqDafHTwTx%2FeK4hbbcYzHQ%2FEnEaWCpj73R54y1PHE682WljKcPQlGZXcSatMWUxK48d79UI5gbcAQUQQ7gFoVuT9x4IXI8X5l5fnvNukD7d1RAv581p8xuvbt0hcXle%2BjvmvxiczGKb%2FTy5%2FQguj3dCYgzM25SG9RmlFkUrdT7ECwbNuA8Kw%3D%3D",
+              "return_url": "http%3A%2F%2F101.34.159.151%3A8329%2F",
+              "notify_url": "http%3A%2F%2F101.34.159.151%3A9001%2Fscs%2Fnotifies%2Fbackend",
+              "version": "1.0",
+              "app_id": "2021000118699056",
+              "sign_type": "RSA2",
+              "timestamp": "2022-01-18+16%3A51%3A31",
+              "alipay_sdk": "alipay-sdk-java-dynamicVersionNo",
+              "format": "json",
+              subject:"款式订单",
+              product_code:"QUICK_WAP_WAY",
+              out_trade_no:"ZQL1642495891908",
+              total_amount:0.01
+            }
+          }, function (result) {
+            if(result.resultStatus == '5002555')
+            {
+              uni.showToast({
+                title: '支付sdk出错'
+              })
+            }else if(result.resultStatus == '9000')
+            {
+              // that.vusui.msg('支付成功')
+              uni.showToast({
+                title: '支付成功'
+              })
+            }else{
+              // that.vusui.msg(result.memo)
+              uni.showToast({
+                title: result.memo
+              })
+            }
+
+          })// 支付完成回调
+        }
+      })
+
+
+        return;
+      uni.requestPayment({
+        provider: 'alipay',
+        orderInfo: {
+          "charset": "UTF-8",
+          "method": "alipay.trade.wap.pay",
+          "sign": "NWYSVaKc1hnFm1QL%2BLhUT4WdTglbyv94FeLlEa7%2BXYADec99w6F%2FvxgfTLXAd4%2BviDDuC4cdHOh7mtxDIJruqImXorRwls5DUa2u3nRPe%2BnbplJ8hbmPlqBZEJw1zWO5ND%2FXH4ANQw%2BBKQrhr6adghH0g%2BkxT2X%2Bs%2B%2FqDafHTwTx%2FeK4hbbcYzHQ%2FEnEaWCpj73R54y1PHE682WljKcPQlGZXcSatMWUxK48d79UI5gbcAQUQQ7gFoVuT9x4IXI8X5l5fnvNukD7d1RAv581p8xuvbt0hcXle%2BjvmvxiczGKb%2FTy5%2FQguj3dCYgzM25SG9RmlFkUrdT7ECwbNuA8Kw%3D%3D",
+          "return_url": "http%3A%2F%2F101.34.159.151%3A8329%2F",
+          "notify_url": "http%3A%2F%2F101.34.159.151%3A9001%2Fscs%2Fnotifies%2Fbackend",
+          "version": "1.0",
+          "app_id": "2021000118699056",
+          "sign_type": "RSA2",
+          "timestamp": "2022-01-18+16%3A51%3A31",
+          "alipay_sdk": "alipay-sdk-java-dynamicVersionNo",
+          "format": "json",
+          subject:"款式订单",
+          product_code:"QUICK_WAP_WAY",
+          out_trade_no:"ZQL1642495891908",
+          total_amount:0.01
+        }, //支付宝订单数据
+        success: res => {
+          uni.showToast({
+            title: 'success'
+          })
+        },
+        fail: err => {
+          // console.log('支付取消或者失败:', err);
+          // err.errMsg !== "requestPayment:fail cancel" && that.payResult('fail')
+          uni.showToast({
+            title: 'requestPayment:fail cancel'
+          })
+        }
+      });
+    },
     searchPotentialCustomers(){
       this.pageOptions = {
         current: 1,

src/pages/material/createMaterial.vue

@@ -22,7 +22,7 @@
               '--src': `url(${$IMG_URL}${detail.originalImageCode})`,
               '--transform': `rotate(${angle}deg)`,
             }"
-            src=""
+            src="`${$IMG_URL}${detail.originalImageCode}`"
             mode="heightFix"
             class="height-750rpx view"
           ></image>

src/pages/material/entrustManagement.vue

@@ -319,9 +319,8 @@ export default {
             item.children.filter(($item) => this.selectedIds.indexOf($item.id) === -1)
         );
       }else{
-        // this.selected = this.selected.concat(
-        //     item.children.filter(($item) => this.selectedIds.indexOf($item.id) === -1)
-        // );
+        let removeData = item.children.map((item) => item.id);
+        this.selected = this.selected.filter((item) => removeData.indexOf(item.id) === -1)
       }
     },
     // 单选 确定/取消

src/pages/modeling/addItem.vue

@@ -416,15 +416,16 @@ export default {
     removeColor(){
       let list = this.detail.modelingTaskMaterialColourList;
       let checked = this.checkedList;
-
       for (const item of list) {
-        let index = checked.indexOf(item.id);
-        if(index > -1){
-          this.$set(item,'isDeleted',true)
-        }else{
-          list.splice(index,1)
+        if(item.id){
+          let index = checked.indexOf(item.id);
+          if(index > -1){
+            this.$set(item,'isDeleted',true)
+          }
         }
       }
+      list = list.filter((item) => checked.indexOf(item.id) > -1);
+     // console.log(list)
     },
     // 颜色库选择 点击时间 存一份选中状态 在确定的时候过滤
     selectColor(colorItem){