活动修改、门店信息、app日志信息

src/views/common/login.vue

@@ -15,17 +15,17 @@
             <el-form-item prop="password">
               <el-input v-model="dataForm.password" type="password" placeholder="密码"></el-input>
             </el-form-item>
-            <!--<el-form-item prop="captcha">-->
-              <!--<el-row :gutter="20">-->
-                <!--<el-col :span="14">-->
-                  <!--<el-input v-model="dataForm.captcha" placeholder="验证码">-->
-                  <!--</el-input>-->
-                <!--</el-col>-->
-                <!--<el-col :span="10" class="login-captcha">-->
-                  <!--<img :src="captchaPath" @click="getCaptcha()" alt="">-->
-                <!--</el-col>-->
-              <!--</el-row>-->
-            <!--</el-form-item>-->
+            <!--<el-form-item prop="captcha">
+              <el-row :gutter="20">
+                <el-col :span="14">
+                  <el-input v-model="dataForm.captcha" placeholder="验证码">
+                  </el-input>
+                </el-col>
+                <el-col :span="10" class="login-captcha">
+                  <img :src="captchaPath" @click="getCaptcha()" alt="">
+                </el-col>
+              </el-row>
+            </el-form-item>-->
             <el-form-item>
               <el-button class="login-btn-submit" type="primary" @click="dataFormSubmit()">登录</el-button>
             </el-form-item>

src/views/modules/activity/activity.vue

@@ -485,7 +485,7 @@
           }).then(({data}) => {
             console.log(data)
             if (data && data.code === 0) {
-              for (let i = 0; i < data.actAreas.length; i++ ){
+              for(let i = 0; i < data.actAreas.length; i++ ){
                 this.checkboxGroup1.push(data.actAreas[i].provinceName)
               }
             }

src/views/modules/activity/activityMaterielBase-add-or-update.vue

@@ -0,0 +1,100 @@
+
+<template>
+  <el-dialog
+    :title="!dataForm.mainId ? '新增' : '修改'"
+    :close-on-click-modal="false"
+    :visible.sync="visible">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+          <el-form-item label="销售组织" prop="salesOrganization">
+            <el-input v-model="dataForm.salesOrganization" placeholder="销售组织"></el-input>
+          </el-form-item>
+          <el-form-item label="销售渠道" prop="distributionChannel">
+            <el-input v-model="dataForm.distributionChannel" placeholder="销售渠道"></el-input>
+          </el-form-item>
+          <el-form-item label="产品组" prop="productGroup">
+            <el-input v-model="dataForm.productGroup" placeholder="产品组"></el-input>
+          </el-form-item>
+          <el-form-item label="物料编号" prop="materielCoed">
+            <el-input v-model="dataForm.materielCoed" placeholder="物料编号"></el-input>
+          </el-form-item>
+          <el-form-item label=" 物料描述" prop="materielDescribe">
+            <el-input v-model="dataForm.materielDescribe" placeholder=" 物料描述"></el-input>
+          </el-form-item>
+          <el-form-item label="品牌" prop="brandCode">
+            <el-input v-model="dataForm.brandCode" placeholder="品牌"></el-input>
+          </el-form-item>
+          <el-form-item label="规格" prop="specs">
+            <el-input v-model="dataForm.specs" placeholder="规格"></el-input>
+          </el-form-item>
+          <el-form-item label="花纹" prop="pattern">
+            <el-input v-model="dataForm.pattern" placeholder="花纹"></el-input>
+          </el-form-item>
+          <el-form-item label="层级" prop="hierarchy">
+            <el-input v-model="dataForm.hierarchy" placeholder="层级"></el-input>
+          </el-form-item>
+          <el-form-item label="区分" prop="disthing">
+            <el-input v-model="dataForm.disthing" placeholder="区分"></el-input>
+          </el-form-item>
+          <el-form-item label="细分" prop="tooDisthing">
+            <el-input v-model="dataForm.tooDisthing" placeholder="细分"></el-input>
+          </el-form-item>
+          <el-form-item label="创建时间" prop="creatTime">
+            <el-input v-model="dataForm.creatTime" placeholder="创建时间"></el-input>
+          </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">取消</el-button>
+      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+  export default {
+   props: {
+      dataForm: {
+          type: Object,
+          require: false
+        }
+      },
+    data () {
+      return {
+        visible: false,
+        dataRule: {
+
+        }
+      }
+    },
+    methods: {
+      init () {
+        this.visible = true
+      },
+      // 表单提交
+      dataFormSubmit () {
+        this.$refs['dataForm'].validate((valid) => {
+          if (valid) {
+            this.$http({
+              url: this.$http.adornUrl(`/activity/activityMaterielBase/${!this.dataForm.mainId ? 'save' : 'update'}`),
+              method: 'post',
+              data: this.$http.adornData(this.dataForm)
+            }).then(({data}) => {
+              if (data && data.code === 0) {
+                this.$message({
+                  message: '操作成功',
+                  type: 'success',
+                  duration: 1500,
+                  onClose: () => {
+                    this.visible = false
+                    this.$emit('refreshDataList')
+                  }
+                })
+              } else {
+                this.$message.error(data.msg)
+              }
+            })
+          }
+        })
+      }
+    }
+  }
+</script>

src/views/modules/activity/activityMaterielBase.vue

@@ -0,0 +1,381 @@
+<template>
+  <div class="mod-activityMaterielBase">
+    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form-item>
+        <el-input v-model="dataForm.materielCoed" placeholder="物料号(省略8个0)" clearable></el-input>
+      </el-form-item>
+      <el-form-item>
+          <el-input v-model="dataForm.materielDescribe" placeholder=" 物料描述" clearable></el-input>
+      </el-form-item>
+      <el-form-item>
+          <el-input v-model="dataForm.brandCode" placeholder="品牌" clearable></el-input>
+      </el-form-item>
+      <el-form-item>
+          <el-input v-model="dataForm.specs" placeholder="规格" clearable></el-input>
+      </el-form-item>
+      <el-form-item>
+          <el-input v-model="dataForm.hierarchy" placeholder="层级" clearable></el-input>
+      </el-form-item>
+      <el-form-item>
+          <el-input v-model="dataForm.disthing" placeholder="区分" clearable></el-input>
+      </el-form-item>
+      <el-form-item>
+          <el-input v-model="dataForm.tooDisthing" placeholder="细分" clearable></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="getDataList()">查询</el-button>
+        <el-button v-if="isAuth('activity:activityMaterielBase:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+        <el-button v-if="isAuth('activity:activityMaterielBase:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+      @selection-change="selectionChangeHandle"
+      style="width: 100%;">
+      <el-table-column
+        type="selection"
+        header-align="center"
+        align="center"
+        width="50">
+      </el-table-column>
+      <!--<el-table-column
+        prop="salesOrganization"
+        header-align="center"
+        align="center"
+        label="销售组织">
+      </el-table-column>
+      <el-table-column
+        prop="distributionChannel"
+        header-align="center"
+        align="center"
+        label="销售渠道">
+      </el-table-column>
+      <el-table-column
+        prop="productGroup"
+        header-align="center"
+        align="center"
+        label="产品组">
+      </el-table-column>
+      <el-table-column
+        prop="pattern"
+        header-align="center"
+        align="center"
+        label="花纹">
+      </el-table-column>
+      -->
+      <el-table-column
+        prop="materielCoed"
+        header-align="center"
+        align="center"
+        label="物料编号">
+      </el-table-column>
+      <el-table-column
+        prop="materielDescribe"
+        header-align="center"
+        align="center"
+        width="200px"
+        label=" 物料描述">
+      </el-table-column>
+      <el-table-column
+        prop="brandCode"
+        header-align="center"
+        align="center"
+        label="品牌">
+      </el-table-column>
+      <el-table-column
+        prop="specs"
+        header-align="center"
+        align="center"
+        label="规格">
+      </el-table-column>
+      <el-table-column
+        prop="hierarchy"
+        header-align="center"
+        align="center"
+        label="层级">
+      </el-table-column>
+      <el-table-column
+        prop="disthing"
+        header-align="center"
+        align="center"
+        label="区分">
+      </el-table-column>
+      <el-table-column
+        prop="tooDisthing"
+        header-align="center"
+        align="center"
+        label="细分">
+      </el-table-column>
+      <el-table-column
+        prop="creatTime"
+        header-align="center"
+        align="center"
+        label="创建时间">
+      </el-table-column>
+
+      <el-table-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="150"
+        label="操作">
+        <template slot-scope="scope">
+          <el-button v-if="isAuth('activity:activityMaterielBase:edit')" type="text" size="small" @click="addOrUpdateHandle(scope.row)">修改</el-button>
+          <el-button v-if="isAuth('activity:activityMaterielBase:delete')" type="text" size="small" @click="deleteHandle(scope.row.mainId)">删除</el-button>
+          <el-button type="text" size="small" @click="showBingActivity(scope.row)">查看绑定活动信息</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="dataForm.current"
+      :page-sizes="[10, 20, 50, 100]"
+      :page-size="dataForm.size"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+    <!-- 弹窗, 新增 / 修改 -->
+    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" :dataForm="editModel"></add-or-update>
+
+
+
+    <!-- 绑定活动弹窗 -->
+    <el-dialog
+      title="提示"
+      :visible.sync="dialogVisible"
+      width="80%"
+    >
+      <el-row>
+        <el-form :inline="true" :model="formInline" class="demo-form-inline" label-width="80px">
+          <el-col :span="8">
+            <el-form-item label="物料描述" prop="materielDescribe">
+              <el-input v-model="formInline.materielDescribe" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="物料编号" prop="materielCoed">
+              <el-input v-model="formInline.materielCoed"  :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="品牌" prop="brandCode">
+              <el-input v-model="formInline.brandCode"  :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-table
+            :data="activityList"
+            border
+            style="width: 100%;">
+            <el-table-column
+              type="selection"
+              header-align="center"
+              align="center"
+              width="50">
+            </el-table-column>
+            <el-table-column
+              prop="activityName"
+              header-align="center"
+              align="center"
+              label="活动名称">
+            </el-table-column>
+            <el-table-column
+              prop="beginDate"
+              header-align="center"
+              align="center"
+              label="开始时间">
+            </el-table-column>
+            <el-table-column
+              prop="endDate"
+              header-align="center"
+              align="center"
+              label="结束时间">
+            </el-table-column>
+            <el-table-column
+              prop="storeIntegral"
+              header-align="center"
+              align="center"
+              label="门店积分奖励">
+            </el-table-column>
+            <el-table-column
+              prop="storeBonus"
+              header-align="center"
+              align="center"
+              label="门店冻结奖励">
+            </el-table-column>
+            <el-table-column
+              prop="agentBonus"
+              header-align="center"
+              align="center"
+              label="经销商奖励">
+            </el-table-column>
+          </el-table>
+        </el-col>
+      </el-row>
+
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="dialogVisible = false">关 闭</el-button>
+      </span>
+    </el-dialog>
+
+
+
+
+  </div>
+</template>
+
+<script>
+  import AddOrUpdate from './activityMaterielBase-add-or-update'
+  export default {
+    data () {
+      return {
+        dataForm: {
+          salesOrganization: '',
+          distributionChannel: '',
+          productGroup: '',
+          materielCoed: '',
+          materielDescribe: '',
+          brandCode: '',
+          specs: '',
+          pattern: '',
+          hierarchy: '',
+          disthing: '',
+          tooDisthing: '',
+          current: 1,
+          size: 10
+        },
+        editModel: {},
+        dataList: [],
+        totalPage: 0,
+        dataListLoading: false,
+        dataListSelections: [],
+        addOrUpdateVisible: false,
+        ialogVisible: false,
+        formInline: {},
+        dialogVisible: false,
+        activityList: []
+      }
+    },
+    components: {
+      AddOrUpdate
+    },
+    activated () {
+      this.getDataList()
+    },
+    methods: {
+      // 获取数据列表
+      getDataList () {
+        this.dataListLoading = true
+        this.$http({
+          url: this.$http.adornUrl('/activity/activityMaterielBase/page'),
+          method: 'get',
+          params: this.$http.adornParams(this.dataForm)
+        }).then(({data}) => {
+          if (data && data.code === 0) {
+            this.dataList = data.page.records
+            this.totalPage = data.page.total
+          } else {
+            this.dataList = []
+            this.totalPage = 0
+          }
+          this.dataListLoading = false
+        })
+      },
+      // 每页数
+      sizeChangeHandle (val) {
+        this.dataForm.size = val
+        this.dataForm.current = 1
+        this.getDataList()
+      },
+      // 当前页
+      currentChangeHandle (val) {
+        this.dataForm.current = val
+        this.getDataList()
+      },
+      // 多选
+      selectionChangeHandle (val) {
+        this.dataListSelections = val
+      },
+      // 新增 / 修改
+      addOrUpdateHandle (row) {
+        this.addOrUpdateVisible = true
+        if (row) {
+          this.editModel = row
+        } else {
+          this.editModel = {
+            mainId: null,
+            salesOrganization: null,
+            distributionChannel: null,
+            productGroup: null,
+            materielCoed: null,
+            materielDescribe: null,
+            brandCode: null,
+            specs: null,
+            pattern: null,
+            hierarchy: null,
+            disthing: null,
+            tooDisthing: null,
+            creatTime: null,
+          }
+        }
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init()
+        })
+      },
+      // 删除
+      deleteHandle (id) {
+        var activityMaterielBaseIds = id ? [id] : this.dataListSelections.map(item => {
+          return item.userId
+        })
+        this.$confirm(`确定对[id=${activityMaterielBaseIds.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.$http({
+            url: this.$http.adornUrl('/activity/activityMaterielBase/delete'),
+            method: 'post',
+            data: this.$http.adornData(activityMaterielBaseIds, false)
+          }).then(({data}) => {
+            if (data && data.code === 0) {
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                  this.getDataList()
+                }
+              })
+            } else {
+              this.$message.error(data.msg)
+            }
+          })
+        }).catch(() => {})
+      },
+      // 查看物料绑定的活动信息
+      showBingActivity (row) {
+        this.formInline = row
+        this.dialogVisible = true
+        // 根据物料描述查看绑定活动
+        this.$http({
+          url: this.$http.adornUrl('/activity/activityMaterielBase/getActivityByMat'),
+          method: 'post',
+          data: this.$http.adornData({'materielDescribe': row.materielDescribe})
+        }).then(({data}) => {
+          if (data && data.code === 0) {
+            this.activityList = data.data
+          } else {
+            this.$message.error(data.msg)
+          }
+        })
+
+      }
+    }
+  }
+</script>

src/views/modules/appconfig/configBrand-add-or-update.vue

@@ -76,15 +76,9 @@
           brandName: [
             { required: true, message: '品牌名称不可为空', trigger: 'blur' }
           ],
-          brandEng: [
-            { required: true, message: '品牌英文名称不可为空', trigger: 'blur' }
-          ],
           seriesCode: [
             { required: true, message: '品牌所属系列编码不可为空', trigger: 'blur' }
           ],
-          logoUrl: [
-            { required: true, message: '品牌图片必须上传', trigger: 'blur' }
-          ],
           useStatus: [
             { required: true, message: '请选择有效状态', trigger: 'blur' }
           ]

src/views/modules/appconfig/configBrand.vue

@@ -31,12 +31,12 @@
         align="center"
         label="品牌中文名称">
       </el-table-column>
-      <el-table-column
+      <!--<el-table-column
         prop="brandEng"
         header-align="center"
         align="center"
         label="品牌英语名称">
-      </el-table-column>
+      </el-table-column>-->
       <el-table-column
         prop="seriesCode"
         header-align="center"
@@ -53,7 +53,7 @@
       <el-table-column prop="" label="LOGO" width="280">
         <!--加入下面的内容,scope.row代表这一行,img是显示这一行的哪个字段,我的是img,你的自己看下-->
         <template slot-scope="scope">
-          <img :src="scope.row.logoUrl" alt="" width="40%" height="40%">
+          <img v-if="scope.row.logoUrl != null" :src="scope.row.logoUrl" alt="" width="40%" height="40%">
         </template>
       </el-table-column>
 

src/views/modules/log/sysFunctionLog-add-or-update.vue

@@ -5,22 +5,66 @@
     :close-on-click-modal="false"
     :visible.sync="visible">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
-          <el-form-item label="账号id" prop="accountId">
-            <el-input v-model="dataForm.accountId" placeholder="账号id"></el-input>
+      <el-form-item label="账号id" prop="accountId">
+        <el-input v-model="dataForm.accountId" placeholder="账号id" :disabled="true"></el-input>
+      </el-form-item>
+      <el-form-item label="门店Id" prop="accountId">
+        <el-input v-model="dataForm.storeId" placeholder="门店Id" :disabled="true"></el-input>
+      </el-form-item>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="系统类型" prop="accountId">
+            <el-input v-model="dataForm.osType" placeholder="os类型" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="功能名称" prop="functionName">
-            <el-input v-model="dataForm.functionName" placeholder="功能名称"></el-input>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="系统版本" prop="accountId">
+            <el-input v-model="dataForm.osVersion" placeholder="系统版本" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="IP地址" prop="ipAddress">
-            <el-input v-model="dataForm.ipAddress" placeholder="IP地址"></el-input>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="手机品牌" prop="accountId">
+            <el-input v-model="dataForm.phoneBrand" placeholder="手机品牌" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="调用时间" prop="createTime">
-            <el-input v-model="dataForm.createTime" placeholder="调用时间"></el-input>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="手机型号" prop="accountId">
+            <el-input v-model="dataForm.phoneModel" placeholder="手机型号" :disabled="true"></el-input>
           </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="APP版本" prop="accountId">
+            <el-input v-model="dataForm.appVersion" placeholder="APP版本" :disabled="true"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="网络状态" prop="accountId">
+            <el-input v-model="dataForm.networkType" placeholder="网络状态" :disabled="true"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+
+      <el-form-item label="功能名称" prop="functionName">
+        <el-input v-model="dataForm.functionName" placeholder="功能名称" :disabled="true"></el-input>
+      </el-form-item>
+
+      <el-form-item label="请求JSON" prop="functionName">
+        <el-input v-model="dataForm.paramsJson" placeholder="请求JSON" type="textarea" :disabled="true"></el-input>
+      </el-form-item>
+
+      <el-form-item label="IP地址" prop="ipAddress">
+        <el-input v-model="dataForm.ipAddress" placeholder="IP地址" :disabled="true"></el-input>
+      </el-form-item>
+      <el-form-item label="调用时间" prop="createTime">
+        <el-input v-model="dataForm.createTime" placeholder="调用时间" :disabled="true"></el-input>
+      </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
-      <el-button @click="visible = false">取消</el-button>
-      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+      <el-button @click="visible = false">关 闭</el-button>
+      <!--<el-button type="primary" @click="dataFormSubmit()">确定</el-button>-->
     </span>
   </el-dialog>
 </template>

src/views/modules/log/sysFunctionLog.vue

@@ -64,7 +64,7 @@
         width="150"
         label="操作">
         <template slot-scope="scope">
-          <el-button v-if="isAuth('log:sysFunctionLog:edit')" type="text" size="small" @click="addOrUpdateHandle(scope.row)">修改</el-button>
+          <el-button v-if="isAuth('log:sysFunctionLog:edit')" type="text" size="small" @click="addOrUpdateHandle(scope.row)">查看详情</el-button>
           <el-button v-if="isAuth('log:sysFunctionLog:delete')" type="text" size="small" @click="deleteHandle(scope.row.mainId)">删除</el-button>
         </template>
       </el-table-column>
@@ -127,13 +127,13 @@
       },
       // 每页数
       sizeChangeHandle (val) {
-        this.pageSize = val
-        this.pageIndex = 1
+        this.dataForm.size = val
+        this.dataForm.current = 1
         this.getDataList()
       },
       // 当前页
       currentChangeHandle (val) {
-        this.pageIndex = val
+        this.dataForm.current = val
         this.getDataList()
       },
       // 多选
@@ -150,7 +150,13 @@
             mainId: null,
             accountId: null,
             functionName: null,
+            paramsJson: null,
             ipAddress: null,
+            osType: null,
+            osVersion: null,
+            phoneBrand: null,
+            phoneModel: null,
+            networkType: null,
             createTime: null
           }
         }

src/views/modules/store/storeBasicInfo.vue

@@ -383,7 +383,7 @@
               label="扫码类别">
             </el-table-column>
             <el-table-column
-              prop="isRegular"
+              prop="flagRegular"
               header-align="center"
               align="center"
               label="是否正规">
@@ -579,22 +579,22 @@
         }).catch(() => {})
       },
       // 关闭签约品牌
-      handleClose(done) {
+      handleClose (done) {
         this.$confirm('确认关闭？')
           .then(_ => {
             this.storeBrandMsgList = []
-            done();
+            done()
           })
-          .catch(_ => {});
+          .catch(_ => {})
       },
       // 关闭签约品牌
-      handleCloseBrand(done) {
+      handleCloseBrand (done) {
         this.$confirm('确认关闭？')
           .then(_ => {
             this.storeBrandMsgList = []
-            done();
+            done()
           })
-          .catch(_ => {});
+          .catch(_ => {})
       },
       // 门店签约品牌信息
       storeBrandMsg (storeId) {
@@ -682,7 +682,7 @@
           return '正常'
         } else if (row.blockStatus === '1') {
           return '冻结'
-        }  else {
+        } else {
           return '数据异常'
         }
       },
@@ -691,9 +691,9 @@
           return '待审核'
         } else if (row.agentStatus === '1') {
           return '审核通过'
-        }  else if (row.agentStatus === '2') {
+        } else if (row.agentStatus === '2') {
           return '拒绝'
-        }  else {
+        } else {
           return '数据异常'
         }
       },
@@ -702,9 +702,9 @@
           return '待审核'
         } else if (row.b2bStatus === '1') {
           return '审核通过'
-        }  else if (row.b2bStatus === '2') {
+        } else if (row.b2bStatus === '2') {
           return '拒绝'
-        }  else {
+        } else {
           return '数据异常'
         }
       }

src/views/modules/sys/appVersionLog-add-or-update.vue

@@ -1,4 +1,3 @@
-
 <template>
   <el-dialog
     :title="!dataForm.mainId ? '新增' : '修改'"
@@ -6,35 +5,36 @@
     :visible.sync="visible"
     width="600px"
   >
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
-          <el-form-item label="版本号" prop="versionName">
-            <el-input v-model="dataForm.versionName" placeholder="版本号"></el-input>
-          </el-form-item>
-          <el-form-item label="APP类型" prop="appType">
-            <!--<el-input v-model="dataForm.appType" placeholder="app类型 0门店  1经销商"></el-input>-->
-            <el-radio-group v-model="dataForm.appType">
-              <el-radio :label="0">门店</el-radio>
-              <el-radio :label="1">经销商</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="下载地址" prop="downloadUrl">
-            <!--<el-input v-model="dataForm.downloadUrl" placeholder="下载地址"></el-input>-->
-            <el-upload
-              drag
-              :before-upload="beforeUpload"
-              :action="uploadURL"
-              :headers="myHeaders"
-              :multiple= false
-              :on-success = "handleSuccessForFile"
-              :v-model = "dataForm.fileUrl">
-              <i class="el-icon-upload"></i>
-              <div class="el-upload__text">将文件拖到此处1，或<em>点击上传</em></div>
-              <div class="el-upload__tip" slot="tip">只能上传apk文件</div>
-            </el-upload>
-          </el-form-item>
-          <!--<el-form-item label="状态 0禁用  1启用" prop="flagStatus">
-            <el-input v-model="dataForm.flagStatus" placeholder="状态 0禁用  1启用"></el-input>
-          </el-form-item>-->
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()"
+             label-width="80px">
+      <el-form-item label="版本号" prop="versionName">
+        <el-input v-model="dataForm.versionName" placeholder="版本号"></el-input>
+      </el-form-item>
+      <el-form-item label="APP类型" prop="appType">
+        <!--<el-input v-model="dataForm.appType" placeholder="app类型 0门店  1经销商"></el-input>-->
+        <el-radio-group v-model="dataForm.appType">
+          <el-radio :label="0">门店</el-radio>
+          <el-radio :label="1">经销商</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="下载地址" prop="downloadUrl">
+        <!--<el-input v-model="dataForm.downloadUrl" placeholder="下载地址"></el-input>-->
+        <el-upload
+          drag
+          :before-upload="beforeUpload"
+          :action="uploadURL"
+          :headers="myHeaders"
+          :multiple=false
+          :on-success="handleSuccessForFile"
+          :v-model="dataForm.fileUrl">
+          <i class="el-icon-upload"></i>
+          <div class="el-upload__text">将文件拖到此处1，或<em>点击上传</em></div>
+          <div class="el-upload__tip" slot="tip">只能上传apk文件</div>
+        </el-upload>
+      </el-form-item>
+      <!--<el-form-item label="状态 0禁用  1启用" prop="flagStatus">
+        <el-input v-model="dataForm.flagStatus" placeholder="状态 0禁用  1启用"></el-input>
+      </el-form-item>-->
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">取消</el-button>
@@ -44,30 +44,28 @@
 </template>
 
 <script>
-  const token = localStorage.getItem('token'); // 要保证取到
+const token = localStorage.getItem('token') // 要保证取到
 export default {
   props: {
     dataForm: {
-        type: Object,
-        require: false
-      }
-    },
-  data () {
+      type: Object,
+      require: false
+    }
+  },
+  data() {
     return {
       visible: false,
-      dataRule: {
-
-      },
+      dataRule: {},
       uploadURL: '/api/sys//sys/appVersionLog/uploadFileToHuaweiOBS',
       myHeaders: {token: token}
     }
   },
   methods: {
-    init () {
+    init() {
       this.visible = true
     },
     // 表单提交
-    dataFormSubmit () {
+    dataFormSubmit() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           this.$http({
@@ -92,27 +90,27 @@ export default {
         }
       })
     },
-    beforeUpload (file) {
-      const testMsg = file.name.substring(file.name.lastIndexOf('.') + 1);
-      const extension = testMsg === 'apk'
-      if (!extension) {
-        this.$message({
-          message: '上传文件只能是apk格式!',
-          type: 'warning'
-        })
-      }
-      return extension
-    },
-    // 上传成功
-    handleSuccessForFile (response, file, fileList) {
-      if (response && response.code === 0) {
-        if (this.num === this.successNum) {
-          this.dataForm.fileUrl = response.url
-      } else {
-          this.$message.error(response.msg)
-        }
-      }
-    }
+     beforeUpload(file) {
+       const testMsg = file.name.substring(file.name.lastIndexOf('.') + 1)
+       const extension = testMsg === 'apk'
+       if (!extension) {
+         this.$message({
+           message: '上传文件只能是apk格式!',
+           type: 'warning'
+         })
+       }
+       return extension
+     },
+     // 上传成功
+     handleSuccessForFile(response, file, fileList) {
+       if (response && response.code === 0) {
+         if (this.num === this.successNum) {
+           this.dataForm.fileUrl = response.url
+         } else {
+           this.$message.error(response.msg)
+         }
+       }
+     }
   }
 }
 </script>

src/views/modules/sys/log.vue

@@ -15,7 +15,7 @@
       v-loading="dataListLoading"
       style="width: 100%">
       <el-table-column
-        prop="id"
+        prop="id"yo
         header-align="center"
         align="center"
         width="80"