细节小改

src/views/dzk/Dzk_Rule.vue

@@ -218,6 +218,16 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item
+          prop="isLabel"
+          label="是否叠加标签"
+          :required="settingForm.isLabel == 1"
+        >
+          <el-radio-group v-model="settingForm.isLabel">
+            <el-radio label="1">叠加</el-radio>
+            <el-radio label="0">不叠加</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item
           prop="enjoyIntegralMultiple"
           label="支付产生积分倍数"
           :required="settingForm.cardEnabledFlag == 1"

src/views/system/dept/index.vue

@@ -142,46 +142,45 @@
               <el-input v-model="form.jiBie"  maxlength="50" />
             </el-form-item>
           </el-col>
-
           <el-col :span="12" v-show="isShow">
             <el-form-item label="油站地址" prop="deptAddress">
               <el-input v-model="form.deptAddress"  maxlength="50" />
             </el-form-item>
           </el-col>
-
           <el-col :span="12" v-show="isShow">
-            <el-form-item label="油枪数量" prop="oilGunNum">
-              <el-input v-model="form.oilGunNum"  maxlength="50" />
+            <el-form-item label="油站经度" prop="stationLatitude">
+              <el-input v-model="form.stationLatitude"  maxlength="50" />
             </el-form-item>
           </el-col>
           <el-col :span="12" v-show="isShow">
-            <el-form-item label="油站照片" prop="stationPic">
-              <el-input v-model="form.stationPic"  maxlength="50" />
+            <el-form-item label="油站纬度" prop="stationLongitude">
+              <el-input v-model="form.stationLongitude"  maxlength="50" />
             </el-form-item>
           </el-col>
+        
           <el-col :span="12" v-show="isShow">
-            <el-form-item label="油站经度" prop="stationLatitude">
-              <el-input v-model="form.stationLatitude"  maxlength="50" />
+            <el-form-item label="小程序appID" prop="appId">
+              <el-input v-model="form.appId"  maxlength="50" />
             </el-form-item>
           </el-col>
           <el-col :span="12" v-show="isShow">
-            <el-form-item label="油站纬度" prop="stationLongitude">
-              <el-input v-model="form.stationLongitude"  maxlength="50" />
+            <el-form-item label="小程序appSecret" prop="appSecret">
+              <el-input v-model="form.appSecret"  maxlength="50" />
             </el-form-item>
           </el-col>
           <el-col :span="12" v-show="isShow">
-            <el-form-item label="商户号" prop="mno">
-              <el-input v-model="form.mno"  maxlength="50" />
+            <el-form-item label="公众号appID" prop="gzhAppId">
+              <el-input v-model="form.gzhAppId"  maxlength="50" />
             </el-form-item>
           </el-col>
           <el-col :span="12" v-show="isShow">
-            <el-form-item label="小程序appID" prop="appId">
-              <el-input v-model="form.appId"  maxlength="50" />
+            <el-form-item label="公众号appSecret" prop="gzhAppSecret">
+              <el-input v-model="form.gzhAppSecret"  maxlength="50" />
             </el-form-item>
           </el-col>
           <el-col :span="12" v-show="isShow">
-            <el-form-item label="小程序appSecret" prop="appSecret">
-              <el-input v-model="form.appSecret"  maxlength="50" />
+            <el-form-item label="商户号" prop="mno">
+              <el-input v-model="form.mno"  maxlength="50" />
             </el-form-item>
           </el-col>
           <el-col :span="12">