bug修改

components/dkbase/dk-tree-form-more/dk-tree-form-more.js

@@ -8,6 +8,16 @@ const tranverse = (e, itemListKey) => {
     e[i].selected = false;
   }
 }
+const tranverseTrue = (e, itemListKey) => {
+
+  for (let i in e) {
+    if (e[i][itemListKey]) {
+      e[i].open = true;
+      tranverseTrue(e[i][itemListKey], itemListKey)
+    }
+    e[i].selected = true;
+  }
+}
 Component({
   properties: {
     treeList: Object,
@@ -27,7 +37,7 @@ Component({
       type: String,
       value: ""
     },
-    flgValidOnFlag:{ //默认显示启用
+    flgValidOnFlag: { //默认显示启用
       type: Boolean,
       value: true
     },
@@ -61,7 +71,7 @@ Component({
     isLastClickFlag: {  //控制是否只可以点击末级
       type: Boolean,
       value: false
-  },
+    },
   },
   data: {
   },
@@ -91,13 +101,13 @@ Component({
 
     onSwipeBind(e) {
       console.log('onSwipeBind', e);
-      this.triggerEvent('onSwipe',e);
+      this.triggerEvent('onSwipe', e);
     },
-    subonSwipeBind_(e){
+    subonSwipeBind_(e) {
       console.log('subonSwipeBind_', e);
       this.triggerEvent('onSwipe', e.detail);
     },
- 
+
     // onSwipeBind_(e) {
     //   console.log('onSwipeBind_', e)
     //   this.triggerEvent('onSwipe_', e);
@@ -124,6 +134,28 @@ Component({
       })
 
     },
+    //设置控件信息
+    setDataFromPageTrue(data) {
+      const { itemListKey } = this.data;
+      const { parentIdKey } = this.data;
+      let treeList = data
+      for (let i in treeList) {
+        if (treeList[i][itemListKey]) {
+          if (treeList[i][parentIdKey]) {
+            treeList[i].open = true;
+          } else {
+            treeList[i].open = true;
+          }
+          tranverseTrue(treeList[i][itemListKey], itemListKey);
+        }
+        treeList[i].selected = true;
+      }
+
+      this.setData({
+        tree: treeList
+      })
+
+    },
     //修改折叠状态
     changeOpen(tree, id, itemListKey, idKey) {
       for (let i = 0; i < tree.length; i += 1) {
@@ -163,20 +195,20 @@ Component({
     clickName(e) {
       const { idKey } = this.data;
       const { nameKey } = this.data;
-      const { itemListKey } = this.data; 
+      const { itemListKey } = this.data;
 
-      if(this.data.isLastClickFlag){ //开启只点击末级  
-        if(e.currentTarget.dataset.item[itemListKey]){ //还有子list 说明就不是末级
+      if (this.data.isLastClickFlag) { //开启只点击末级  
+        if (e.currentTarget.dataset.item[itemListKey]) { //还有子list 说明就不是末级
           return
         }
-      } 
-      this.triggerEvent('clickName', { id: e.currentTarget.dataset.item[idKey], name: e.currentTarget.dataset.item[nameKey] ,item:e.currentTarget.dataset.item});
+      }
+      this.triggerEvent('clickName', { id: e.currentTarget.dataset.item[idKey], name: e.currentTarget.dataset.item[nameKey], item: e.currentTarget.dataset.item });
 
     },
     //点击控件里的控件 回调
     subclickName(e) {
 
-      this.triggerEvent('clickName', { id: e.detail.id, name: e.detail.name,item:e.detail.item });
+      this.triggerEvent('clickName', { id: e.detail.id, name: e.detail.name, item: e.detail.item });
     },
     click(e) {
       console.log("click")

package-base-select/pages/select-product-types/select-product-types.js

@@ -36,7 +36,8 @@ Page({
       tableData: util.convertToChildren(tableData, 'parentId', 'catId', null)
     })
     const myComponent = this.selectComponent('#treeSelect');
-    myComponent.setDataFromPage(this.data.tableData);
+    myComponent.setDataFromPageTrue([]);
+    myComponent.setDataFromPageTrue(this.data.tableData);
   },
     /**
    * @desc : 设置查询参数

package-basic-data/pages/product-attribute/product-attribute.js

@@ -301,6 +301,7 @@ Page({
         tableData: util.convertToChildren(tableData, 'parentId', 'catId', null)
       })
       const myComponent = this.selectComponent('#treeSelect');
+      myComponent.setDataFromPage([]);
       myComponent.setDataFromPage(this.data.tableData);
     }
 

pages/shopping/shopping.js

@@ -16,7 +16,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    imageUrl:config.image_url + '/static/img/',
+    imageUrl: config.image_url + '/static/img/',
     routeObjName: 'goodsSku',
     dataItem: '{}',
     choosedGoodsList: [],
@@ -38,10 +38,10 @@ Page({
       ],
     // 确定按钮
     buttonList: [
-      { name: 'confirm', title: '结算'}
+      { name: 'confirm', title: '结算' }
     ],
     contentList: [
-      { code: 'amount', content: 0, type: 'number' ,title: mixins.$t("totalAmount")},
+      { code: 'amount', content: 0, type: 'number', title: mixins.$t("totalAmount") },
       { type: 'count', code: 'count', quantity: 0 }
     ]
   },
@@ -103,12 +103,13 @@ Page({
 
     if (tableData && tableData.length > 0) {
       tableData.forEach(res => {
-        res.skuImages =  res.skuImages?JSON.parse( res.skuImages.value):''
-        if ( res.skuImages &&  res.skuImages.length > 0) {
-          res.skuImages.forEach(item => {
-            item.url =  config.image_url + item.path
-          });
-        } 
+        res.skuImages = res.skuImages ? JSON.parse(res.skuImages.value) : ''
+         //处理图片
+         if (res.skuImages) {
+          res['imagesUrl'] = res.skuImages.length > 0 ? res.skuImages[0].url : null
+        }
+
+
         res.priceSale = res.priceStandard
       })
       this.setData({
@@ -215,7 +216,7 @@ Page({
       active: e.detail.index
     })
   },
-  selectedProduct(e){
+  selectedProduct(e) {
     this.setData({
       active: e.currentTarget.dataset.active
     })

pages/shopping/shopping.wxml

@@ -53,8 +53,8 @@
           <view style="margin-left: 26rpx;width: 100%;">
             <!-- 标题 -->
             <view>
-              <dk-text fontSize="24rpx" value="{{item.skuCode}}"></dk-text>
-              <!-- <dk-title fontSize="28rpx" titleTag="{{item.brandName}}" title="{{item.skuCode}}"></dk-title> -->
+              <!-- <dk-text fontSize="24rpx" value="{{item.skuModel}}"></dk-text> -->
+              <dk-title fontSize="28rpx" titleTag="{{item.shortName}}" title="{{item.skuModel}}"></dk-title>
             </view>
             <!-- 描述 -->
             <view style="display: flex; ">
@@ -97,7 +97,7 @@
         <van-swipe-cell right-width="{{ 65 }}" data-index="{{index}}" async-close bind:close="delChoosedGoodsItem">
           <view class="goods-item-class">
           <view>
-            <van-image radius="15rpx" custom-class="goods-item-image" fit="fill" src="{{item.skuImages? item.skuImages.path : '' }}" />
+            <van-image radius="15rpx" custom-class="goods-item-image" fit="fill" src="{{item.imagesUrl}}" />
           </view>
           <view style="margin-left: 26rpx;width: 100%;">
             <!-- 标题 -->
@@ -149,7 +149,7 @@
 
 
 
-<dk-popup type="sale" titleTagCol="brandName" subCol="skuCode" descCol="skuModel" titleCol="skuName" priceTitle="标价：" priceCol="priceStandard" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" contentObj="{{popContent}}" bind:commit="editItems">
+<dk-popup type="sale" titleTagCol="shortName" subCol="skuCode" descCol="skuName" titleCol="skuModel" priceTitle="标价：" priceCol="priceStandard" iconCol="imagesUrl"  value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" contentObj="{{popContent}}" bind:commit="editItems">
 </dk-popup>