Merge remote-tracking branch 'origin/master'

fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue

@@ -109,8 +109,8 @@
       </el-table-column>-->
       <el-table-column label="优惠券状态" align="center" prop="status" >
       <template slot-scope="scope">
-        <div v-if="scope.row.status == 0"> <el-tag>启用</el-tag> </div>
+        <div v-if="scope.row.isonline == 1"> <el-tag>上线</el-tag> </div>
-        <div v-if="scope.row.status == 1"> <el-tag type="danger">禁用</el-tag> </div>
+        <div v-if="scope.row.isonline == 0"> <el-tag type="danger">下线</el-tag> </div>
       </template>
       </el-table-column>
 

fuintAdmin/src/views/EventMarketing/giftBlock/index.vue

@@ -409,7 +409,6 @@ import {
     mounted() {
       this.getlist()
       this.gettj()
-
     },
     methods:{
       getwysk(row){

fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue

@@ -45,7 +45,7 @@
 
 
       <el-card  style="margin-bottom: 20px">
-        <el-button type="primary" icon="el-icon-plus"  style="margin-bottom: 10px " @click="addoilBlock()">新增囤油卡</el-button>
+        <el-button type="primary" icon="el-icon-plus"  style="margin-bottom: 10px " @click="addoilBlock()">新增电子囤油卡</el-button>
         <el-alert
           title="当前配置为锁价活动、锁价活动为充值后所得升数进行锁定,卡类型下每个油品最多可创建6个锁价充值活动"
           type="info"
@@ -59,6 +59,12 @@
             type="index"
             >
           </el-table-column>
+
+          <el-table-column
+            prop="type"
+            label="油品信息"
+          >
+          </el-table-column>
           <el-table-column
             prop="lockupPrice"
             label="囤油锁定价(元)/L"
@@ -430,6 +436,8 @@
 
       },
       addoilBlock(){
+        this.gbPrice = null,
+          this.oilPrice=null,
         this.ruleForm = {
             type:this.queryParams.type,
             lockupPrice: 0 ,

gasStation-uni/config.js

@@ -6,11 +6,11 @@ module.exports = {
 	// baseUrl: 'http://www.nuoyunr.com/lananRsc/',
 
 	// baseUrl: 'http://192.168.0.121:8080/',
-	baseUrl: 'http://192.168.0.178:8008/',
+	baseUrl: 'http://192.168.0.196:8081/',
-
+	imagesUrl: 'http://192.168.0.196:8081',
 
 	// baseUrl: 'http://192.168.1.5:8002/cdJdc',
-	imagesUrl: 'http://www.nuoyunr.com/lananRsc',
+	// imagesUrl: 'http://www.nuoyunr.com/lananRsc',
 	// 应用信息
 	appInfo: {
 		// 应用名称

gasStation-uni/pagesMy/Recharge/Recharge.vue

@@ -76,10 +76,10 @@
 						text: "全部"
 					},
 					{
-						text: "储值卡"
+						text: "电子储值卡"
 					},
 					{
-						text: "囤油卡"
+						text: "电子囤油卡"
 					},
 				]