jufubao-admin-library 1.1.181 → 1.1.182

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/library/viewModules/viewStore/viewStore/market/list.vue +7 -1
  2. package/library/viewModules/viewStore/viewStore/market/mc_list.vue +9 -3
  3. package/package.json +1 -1
package/library/viewModules/viewStore/viewStore/market/list.vue CHANGED
@@ -250,6 +250,7 @@ export default {
250
250
  { "ui": "text-button", "name": "预览","type": "text" ,event:'preview'},
251
251
  { "ui": "text-button", "name": "选用", "type": "text" ,event:'choose'},
252
252
  { "ui": "text-button", "name": "已选",disabled:true, "type": "text" ,event:'choosed'},
253
+ { "ui": "text-button", "name": "不可选",disabled:true, "type": "text" ,event:'unChoose' },
253
254
  ].filter(i=>i)
254
255
  }
255
256
  ].filter(i=>i)
@@ -611,7 +612,7 @@ export default {
611
612
  }
612
613
  }
613
614
  if (data.btn.event==='choosed') {
614
- if(data.row.is_selected==='can_selected'){
615
+ if(data.row.is_selected!=='selected'){
615
616
  return false
616
617
  }
617
618
  }
@@ -620,6 +621,11 @@ export default {
620
621
  return false
621
622
  }
622
623
  }
624
+ if(data.btn.event==='unChoose'){
625
+ if(data.row.is_selected!=='no_selected'){
626
+ return false
627
+ }
628
+ }
623
629
  return true
624
630
  }
625
631
  },
package/library/viewModules/viewStore/viewStore/market/mc_list.vue CHANGED
@@ -58,7 +58,7 @@
58
58
  <div>{{scope.row.province_name}}{{scope.row.city_name}}{{scope.row.area_name}}{{scope.row.street_name}}{{scope.row.address}}</div>
59
59
  </template>
60
60
  <template slot="is_selected_name" slot-scope="scope">
61
- <div :style="{color:scope.row.is_selected==='can_selected'?'#606266':scope.row.is_selected==='selected'?'#079C58':'#EB0B0B'}">{{scope.row.is_selected_name}}</div>
61
+ <div :style="{color:scope.row.is_selected==='can_selected'?'#606266':scope.row.is_selected==='selected'?'#079C58':'#EB0B0B'}">{{scope.row.is_selected_name}}</div>
62
62
  </template>
63
63
  <template slot="resource_shop_id" slot-scope="scope">
64
64
  <div>{{scope.row.resource_shop_id?scope.row.resource_shop_id:'-'}}</div>
@@ -195,6 +195,7 @@ export default {
195
195
  { "ui": "text-button", "name": "预览","type": "text" ,event:'preview'},
196
196
  { "ui": "text-button", "name": "选用", "type": "text" ,event:'choose'},
197
197
  { "ui": "text-button", "name": "已选",disabled:true, "type": "text" ,event:'choosed'},
198
+ { "ui": "text-button", "name": "不可选",disabled:true, "type": "text" ,event:'unChoose' },
198
199
  ].filter(i=>i)
199
200
  }
200
201
  ].filter(i=>i)
@@ -479,8 +480,8 @@ export default {
479
480
  }
480
481
  }
481
482
  if (data.btn.event==='choosed') {
482
- if(data.row.is_selected==='can_selected'){
483
- return false
483
+ if(data.row.is_selected!=='selected'){
484
+ return false
484
485
  }
485
486
  }
486
487
  if (data.btn.event==='preview') {
@@ -488,6 +489,11 @@ export default {
488
489
  return false
489
490
  }
490
491
  }
492
+ if(data.btn.event==='unChoose'){
493
+ if(data.row.is_selected!=='no_selected'){
494
+ return false
495
+ }
496
+ }
491
497
  return true
492
498
  }
493
499
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-admin-library",
3
- "version": "1.1.181",
3
+ "version": "1.1.182",
4
4
  "description": "聚福宝福利后台管理系统公共模块",
5
5
  "author": "goashiyong <gaoshiyong1272@vip.163.com>",
6
6
  "scripts": {