Merge branch 'master' into international

config/prod.env.js

@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  GJEDITION: '"domestic"' //domestic 国内  international 国际版
+  GJEDITION: '"international"' //domestic 国内  international 国际版
 }

src/page/appupload/index.vue

@@ -12,7 +12,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="代理商标识" prop='agent'>
-              <el-autocomplete 
+              <el-autocomplete
                 class="inline-input"
                 v-model="ruleForm.agent"
                 :fetch-suggestions="querySearch"
@@ -28,8 +28,8 @@
             </el-form-item>
             <el-form-item label="APP包" prop="fileList">
               <!-- uploadUrl token:sessionStorage.getItem('token') :on-change="uploadSectionFile"-->
-              <el-upload style="width:340px" class="upload-demo" 
-              :limit='1' :on-exceed="handleExceed" 
+              <el-upload style="width:340px" class="upload-demo"
+              :limit='1' :on-exceed="handleExceed"
               action=''
               :on-change="()=>{this.$refs.ruleForm.validateField('fileList')}"
               :http-request="uploadSectionFile"
@@ -49,8 +49,8 @@
                 <el-input v-model="ruleForm.md5" :disabled="!md5"></el-input>
             </el-form-item>
             <el-form-item label="版本信息" prop="jsonFile">
-              <el-upload style="width:340px" class="upload-demo" 
-                accept='.json' :limit='1' 
+              <el-upload style="width:340px" class="upload-demo"
+                accept='.json' :limit='1'
                 :headers="{
                   token:token
                 }"
@@ -84,7 +84,7 @@
           <div class="order-management-table">
             <el-table ref="order_table" class='e-table' :data="cameras" style="width: 100%">
               <el-table-column  label="序号" type="index" width="50" align="center">
-                  <template scope="scope">
+                  <template slot-scope="scope">
                       <span>{{(currentPage - 1) * pagesize + scope.$index + 1}}</span>
                   </template>
               </el-table-column>
@@ -108,7 +108,7 @@
                   <div>{{scope.row.createTime}}</div>
                 </template>
               </el-table-column> -->
-              
+
               <el-table-column label="操作">
                 <template slot-scope="scope">
                   <!-- <el-button type="text" @click="showDialog(scope.row)" class="edit_btn">编辑</el-button> -->
@@ -129,51 +129,51 @@
 </template>
 <script>
 let tempForm = {
-  fileServerType:'',
-  agent:'',
-  appType:'',
-  md5:'',
-  name:'',
-  fileList:[],
-  jsonFile:[]
+  fileServerType: '',
+  agent: '',
+  appType: '',
+  md5: '',
+  name: '',
+  fileList: [],
+  jsonFile: []
 }
 export default {
   data () {
     var validateMD5 = (rule, value, callback) => {
-        if (value === '') {
-          callback(new Error('请输入MD5'));
-        } else {
-          this.chenkMd5(value,callback)
-        }
+      if (value === '') {
+        callback(new Error('请输入MD5'))
+      } else {
+        this.chenkMd5(value, callback)
+      }
     }
-    let validateFileUrl =(rule, value, callback)=>{
-          console.log('fileList',value,this.ruleForm)
-          if(!value){
-            return callback(new Error("请上传文件"))
-          }
-          if (this.ruleForm.fileList.length < 1) {//我控制了FileList 长度代表文件个数
-              callback(new Error("请上传文件"))
-          } else {
-              callback()
-          }
+    let validateFileUrl = (rule, value, callback) => {
+      console.log('fileList', value, this.ruleForm)
+      if (!value) {
+        return callback(new Error('请上传文件'))
+      }
+      if (this.ruleForm.fileList.length < 1) { // 我控制了FileList 长度代表文件个数
+        callback(new Error('请上传文件'))
+      } else {
+        callback()
+      }
     }
     let validateJsonFile = (rule, value, callback) => {
-          console.log('fileList',value,this.ruleForm)
-          if(!value){
-            return callback(new Error("请上传文件"))
-          }
-          if (this.ruleForm.jsonFile.length < 1) {//我控制了FileList 长度代表文件个数
-              callback(new Error("请上传文件"))
-          } else {
-              callback()
-          }
+      console.log('fileList', value, this.ruleForm)
+      if (!value) {
+        return callback(new Error('请上传文件'))
+      }
+      if (this.ruleForm.jsonFile.length < 1) { // 我控制了FileList 长度代表文件个数
+        callback(new Error('请上传文件'))
+      } else {
+        callback()
+      }
     }
     return {
       expands: [],
-      accept:'.ipa, .apk',
-      md5:null,
-      complete:0,
-      completeshow:false,
+      accept: '.ipa, .apk',
+      md5: null,
+      complete: 0,
+      completeshow: false,
       expandedArr: [],
       cameras: [],
       currentPage: 1,
@@ -194,28 +194,28 @@ export default {
       ruleForm: tempForm,
       currentImgType: '',
       rules: {
-        fileList:[{
+        fileList: [{
           required: true, validator: validateFileUrl, trigger: 'change'
         }],
-        jsonFile:[{
+        jsonFile: [{
           required: true, validator: validateJsonFile, trigger: 'change'
         }],
-        appType:[
+        appType: [
           { required: true, message: '请选择APP类型', trigger: 'change' }
         ],
-        agent:[
+        agent: [
           { required: true, message: '请选择或输入代理商', trigger: 'blur' }
         ],
-        fileServerType:[
+        fileServerType: [
           { required: true, message: '请选择上传服务器', trigger: 'change' }
         ],
         companyName: [
           { required: true, message: '请输入客户名称', trigger: 'blur' }
         ],
-        md5:[
+        md5: [
           { required: true, message: '请输入MD5', trigger: 'blur' },
           { validator: validateMD5, trigger: 'blur' }
-          ]
+        ]
       },
       cameraInfo: {
         wifi: '',
@@ -232,7 +232,7 @@ export default {
       currentBalance: '',
       pagesize: 10,
       clients: [],
-      restaurants:[]
+      restaurants: []
     }
   },
   watch: {
@@ -241,19 +241,19 @@ export default {
     }
   },
   methods: {
-    appTypeChange(val){
+    appTypeChange (val) {
       const list = {
-        'Android':'.apk',
-        'IOS':'.ipa',
+        'Android': '.apk',
+        'IOS': '.ipa'
       }
       this.accept = list[val] || '.ipa, .apk'
     },
-    async getAgenetList(){
-      let res = await this.$http.post('/manager/app/agenetList',{})
+    async getAgenetList () {
+      let res = await this.$http.post('/manager/app/agenetList', {})
       let restaurants = []
       if (res.code === 0) {
         restaurants = res.data.map(ele => {
-          return {value:ele}
+          return {value: ele}
         })
       }
       this.restaurants = restaurants
@@ -307,21 +307,21 @@ export default {
         this.total = res.data.total ? res.data.total : 0
       }
     },
-    async chenkMd5 (value,callback) {
-      console.log('value',value == 123456)
-      if(value == this.md5){
-          callback();
-      }else{
-          callback(new Error('MD5错误!请重新输入'));
+    async chenkMd5 (value, callback) {
+      console.log('value', value == 123456)
+      if (value == this.md5) {
+        callback()
+      } else {
+        callback(new Error('MD5错误!请重新输入'))
       }
       return true
     },
-    uploadFile(file, fileList){
+    uploadFile (file, fileList) {
       // this.ruleForm.fileList = fileList
-      console.log('file, fileList)',file, fileList);
+      console.log('file, fileList)', file, fileList)
     },
-    handleExceed(files, fileList) {
-        this.$message.warning(`只能选择一个文件上传`);
+    handleExceed (files, fileList) {
+      this.$message.warning(`只能选择一个文件上传`)
     },
     handleCurrentChange (val) {
       this.currentPage = val
@@ -338,12 +338,12 @@ export default {
       return isLt2M
     },
     removeDomain () {
-      console.log();
+      console.log()
       this.$refs['ruleForm'].validate('md5')
     },
 
     submit () {
-      console.log('submit',this.$refs['ruleForm']);
+      console.log('submit', this.$refs['ruleForm'])
       this.$refs['ruleForm'].validate((valid) => {
         if (valid) {
         // this.addVisible = true
@@ -353,11 +353,11 @@ export default {
         }
       })
     },
-    cancel(){
-        this.ruleForm = tempForm
-        this.$refs['ruleForm'].resetFields()
-        this.md5 = null
-        this.addVisible = false
+    cancel () {
+      this.ruleForm = tempForm
+      this.$refs['ruleForm'].resetFields()
+      this.md5 = null
+      this.addVisible = false
     },
     async _editCompany () {
       let {
@@ -365,7 +365,7 @@ export default {
         agent,
         appType,
         md5,
-        name,
+        name
       } = this.ruleForm
 
       this.fullscreenLoading = true
@@ -374,7 +374,7 @@ export default {
         agent,
         appType,
         md5,
-        name,
+        name
       })
       this.fullscreenLoading = false
       if (res.code === 0) {
@@ -391,47 +391,46 @@ export default {
       }
     },
     handleSelect (row) {
-        this.$refs.ruleForm.validateField('agent')
+      this.$refs.ruleForm.validateField('agent')
     },
-    querySearch(queryString, cb) {
-        var restaurants = this.restaurants;
-        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
-        // 调用 callback 返回建议列表的数据
-        cb(results);
+    querySearch (queryString, cb) {
+      var restaurants = this.restaurants
+      var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants
+      // 调用 callback 返回建议列表的数据
+      cb(results)
     },
-    createFilter(queryString) {
-        return (restaurant) => {
-          return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
-        };
-      },
-    showadd(){
+    createFilter (queryString) {
+      return (restaurant) => {
+        return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
+      }
+    },
+    showadd () {
       this.addVisible = true
     },
-    fileRemove(){
-        this.ruleForm.fileList = []
-        this.ruleForm.md5 = ''
-        this.md5 = null
+    fileRemove () {
+      this.ruleForm.fileList = []
+      this.ruleForm.md5 = ''
+      this.md5 = null
     },
-    handleChange(file){
+    handleChange (file) {
       let fileType = file.type,
-      isLt10M = file.size / 1024/1024  < 10;
+        isLt10M = file.size / 1024 / 1024 < 10
       if (!isLt10M) {
-        this.$message.error("上传文件不能超过10M，请重新上传");
-        return false;
+        this.$message.error('上传文件不能超过10M，请重新上传')
+        return false
       }
       if (file.name !== 'version.json') {
-        this.$message.error("请上传文件名称为version.json");
-        return false;
+        this.$message.error('请上传文件名称为version.json')
+        return false
       }
       this.ruleForm.jsonFile = [file]
-      
     },
-    async uploadSectionFile(params) {
+    async uploadSectionFile (params) {
       const file = params.file,
         fileType = file.type,
-        isImage = fileType.indexOf("image") != -1,
-        isLt1G = file.size / 1024/1024/1024  < 1;
-      console.log('isLt1G',fileType,params);
+        isImage = fileType.indexOf('image') != -1,
+        isLt1G = file.size / 1024 / 1024 / 1024 < 1
+      console.log('isLt1G', fileType, params)
       // 这里常规检验，看项目需求而定
       // if (!isImage) {
       //   this.$message.error("只能上传图片格式png、jpg、gif!");
@@ -439,17 +438,17 @@ export default {
       // }
       if (!isLt1G) {
         this.fileRemove()
-        this.$message.error("上传文件过大，请重新上传");
-        return;
+        this.$message.error('上传文件过大，请重新上传')
+        return
       }
       // 根据后台需求数据格式
-      const form = new FormData();
+      const form = new FormData()
       // 文件对象
-      form.append("file", file);
+      form.append('file', file)
       // 本例子主要要在请求时添加特定属性，所以要用自己方法覆盖默认的action
       // form.append("clientType", 'xxx');
       // 项目封装的请求方法，下面做简单介绍
-      console.log('isLt1G',form,file);
+      console.log('isLt1G', form, file)
       this.completeshow = true
       let res = await this.$http({
         url: '/manager/app/upload',
@@ -460,17 +459,17 @@ export default {
         onUploadProgress: (progressEvent) => {
           this.complete = ((progressEvent.loaded / progressEvent.total) * 100) | 0
           console.log('上传 ' + this.complete)
-        },
+        }
       })
       this.completeshow = false
-      
+
       this.complete = 0
       if (res.code === 0) {
         this.ruleForm.fileList = [file]
         this.ruleForm.name = file.name
         this.md5 = res.data || '0'
       }
-    } 
+    }
   },
   created () {
     this._getCameraData()

src/page/layout/slide.vue

@@ -3,7 +3,7 @@
     <div class="navigator_menu">
       <span>导航面板</span>
     </div>
-    <el-menu text-color="#999" active-text-color="#333" class="el-menu-vertical-demo" @select='handleSelect'>
+    <el-menu text-color="#999"  :default-active="actice_idx" active-text-color="#333" class="el-menu-vertical-demo" @select='handleSelect'>
       <template v-for="(nav, i) in navs">
 
         <router-link tag="div" :to="nav.link" :key="i" v-if="!nav.children">
@@ -37,13 +37,14 @@ export default {
   data () {
     let navs = [
       { text: '首页', link: {name: 'Home'}, top: 14 },
-      { text: '订单管理', link: {name: 'Order'}, 
+      { text: '订单管理',
+        link: {name: 'Order'},
         children: [
           { text: '相机订单', link: {name: 'Order'} },
           { text: '权益订单', link: {name: 'qyOrder'} },
           { text: '下载订单', link: {name: 'downloadOrder'} }
         ],
-      top: 42 },
+        top: 42 },
       // { text: '增值服务', link: {name: 'Added'}, top: 70 },
       // {
       //   text: '代理平台',
@@ -110,10 +111,21 @@ export default {
     ]
 
     return {
-      actice_idx: 1,
+      actice_idx: '1',
       navs: navs
     }
   },
+  mounted () {
+    let index = this.navs.findIndex((i) => {
+      console.log(i.link.name, this.$route.name)
+      return i.link.name === this.$route.name
+    }).toString()
+    console.log(index)
+
+    if (index !== -1) {
+      this.actice_idx = index
+    }
+  },
   methods: {
     handleSelect (key) {
       console.log(key)

src/page/login/index.vue

@@ -89,7 +89,6 @@ export default {
   },
   methods: {
     submitForm (formName) {
-      console.log('process.env.VUE_APP_GJEDITION',process.env.GJEDITION)
       this.$refs[formName].validate((valid) => {
         if (valid) {
           this.login()

src/page/userList/userList.vue

@@ -90,7 +90,7 @@
           </el-select>
         </el-form-item>
         <el-form-item  prop="incrementNum" v-if="addType==1" label="会员数量：" :label-width="formLabelWidth" >
-          <el-input-number v-model="vipForm.incrementNum" :precision="0" :step="1" :max="50" />
+          <el-input-number v-model="vipForm.incrementNum" :precision="0" :step="1" :max="50" :min="1" />
         </el-form-item>
         <el-form-item v-if="vipForm.memberLevels == 'SE' && addType==1"  prop="monthQy" label="会员期限：" :label-width="formLabelWidth" >
           <el-select v-model="vipForm.monthQy" @change="monthQyChange" placeholder="请选择">
@@ -139,7 +139,7 @@ export default {
           value: 'SE',
           label: '高级会员'
         }],
-      ambient:process.env.GJEDITION == 'international'?true:false,
+      ambient:true,
       orders: [],
       currentPage: 1,
       fullscreenLoading: false,