Merge branch 'build' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into build

project/tianfuxing/AppMerchantDiscounts/AppMerchantDiscounts.vue

@@ -9,7 +9,7 @@
               v-model="search.status"
               @change="page.current = 1, getList()"
               placeholder="状态"
-              :selectList="dict.getDict('integralDeclareStatus')">
+              :selectList="dict.getDict('tfx_status')">
             </ai-select>
           </template>
           <template #right>
@@ -69,7 +69,7 @@ export default {
     }
   },
   created () {
-    this.$dict.load('integralDeclareStatus').then(()=> {
+    this.$dict.load('tfx_status').then(()=> {
       this.getList()
     })
   },
@@ -79,7 +79,7 @@ export default {
         {prop: "merchantName", label: "商户名称", align: "left", showOverflowTooltip: true},
         {prop: "title", label: "优惠标题", align: "center"},
         {prop: "content", label: "优惠内容", align: "center"},
-        {prop: "status", label: "状态", align: "center", dict:"integralDeclareStatus"},
+        {prop: "status", label: "状态", align: "center", dict:"tfx_status"},
         {slot: "options"},
       ]
     }