Merge remote-tracking branch 'origin/master'

.env.development

@@ -10,4 +10,4 @@ VUE_APP_BASE_API = '/dev-api'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
-VUE_APP_JUDGE_STAR = 1
+VUE_APP_JUDGE_STAR = 0

src/views/components/BrandSelect.vue

@@ -26,11 +26,13 @@ export default {
   },
   methods:{
     handleBrandChange (id) {
-      if (this.value1) {       
+      if (id) {
         let brand=this.brandList.find(item=>{
           return item.id==id
         })
         this.$emit('change', brand.name);
+      } else {
+        this.$emit('change', null);
       }
     },
   },

src/views/components/ProductCategorySelect.vue

@@ -36,10 +36,12 @@ export default {
     }
   },
   methods: {
-    handleMallCatergoryChange () {
-      if (this.value1 && this.value1.length != 0) {       
+    handleMallCatergoryChange (e) {
+      if (e.length > 0) {
         let arr = this.$refs['cascaderMallCatergory'].getCheckedNodes()[0].pathLabels
         this.$emit('change', arr);
+      } else {
+        this.$emit('change', '');
       }
     },
     recurs(list){

src/views/oms/aftersale/index.vue

@@ -2,10 +2,10 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
       <el-form-item label="申请状态" prop="status">
-        <DictRadio v-model="queryParams.status" :radioData="dict.type.oms_aftersale_status" size="small" :show-all="'all'"></DictRadio>
+        <DictRadio v-model="queryParams.status" :radioData="dict.type.oms_aftersale_status" size="small" :show-all="'all'" @change="handleQuery"></DictRadio>
       </el-form-item>
       <el-form-item label="售后类型" prop="type">
-        <DictRadio v-model="queryParams.type" :radioData="dict.type.oms_aftersale_type" size="small" :show-all="'all'"></DictRadio>
+        <DictRadio v-model="queryParams.type" :radioData="dict.type.oms_aftersale_type" size="small" :show-all="'all'" @change="handleQuery"></DictRadio>
       </el-form-item>
       <el-form-item label="订单号" prop="orderSn">
         <el-input v-model.trim="queryParams.orderSn" placeholder="请输入订单号" clearable size="small"

src/views/oms/order/index.vue

@@ -4,21 +4,12 @@
              class="ry_form">
       <el-form-item label="订单状态" prop="status">
         <DictRadio v-model="queryParams.status" :radioData="dict.type.oms_order_status" size="small" :show-all="'all'"
-                   :filter="['11', '12', '13', '14']"></DictRadio>
+                   :filter="['11', '12', '13', '14']" @change="handleQuery"></DictRadio>
       </el-form-item>
       <el-form-item label="订单编号" prop="orderSn">
         <el-input v-model.trim="queryParams.orderSn" placeholder="请输入订单编号" clearable size="small"
                   @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <!--      <el-form-item label="支付方式" prop="payType">-->
-      <!--        <el-select v-model="queryParams.payType" placeholder="请选择支付方式" clearable size="small">-->
-      <!--          <el-option v-for="(item, index) in dict.type.oms_pay_type" :label="item.label" :value="item.value"/>-->
-      <!--        </el-select>-->
-      <!--      </el-form-item>-->
-      <!--      <el-form-item label="商品名称" prop="productName">-->
-      <!--        <el-input v-model.trim="queryParams.productName" placeholder="请输入商品名称" clearable size="small"-->
-      <!--                  @keyup.enter.native="handleQuery"/>-->
-      <!--      </el-form-item>-->
       <el-form-item label="会员手机号" prop="userPhone">
         <el-input v-model.trim="queryParams.userPhone" placeholder="请输入会员手机号" clearable size="small"
                   @keyup.enter.native="handleQuery"/>
@@ -38,7 +29,6 @@
       <el-form-item class="flex_one tr">
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <!--        <el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" size="mini" @click="showMoreCondition = !showMoreCondition">{{showMoreCondition ? '收起条件' : '展开条件'}}</el-button>-->
       </el-form-item>
     </el-form>
 

src/views/set/integralSetting.vue

@@ -4,7 +4,7 @@
       <div slot="header" class="clearfix">
         <div class="flex-center">
           <h2>积分获取规则</h2>
-          <el-button class="ml-auto" type="primary" @click="saveData" v-hasPermi="['sys:integral:save']">保存
+          <el-button class="ml-auto" type="primary" @click="saveData">保存
           </el-button>
         </div>
       </div>