Bläddra i källkod

feat:更新修改

jinx 3 år sedan
förälder
incheckning
3c86b26b8f

+ 101 - 66
src/assets/css/reset.css

@@ -3,89 +3,111 @@
    License: none (public domain)
 */
 
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed, 
-figure, figcaption, footer, header, hgroup, 
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	font-size: 100%;
-	vertical-align: baseline;
-	font-family: "Microsoft YaHei";
+html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  font-size: 100%;
+  vertical-align: baseline;
+  font-family: "Microsoft YaHei";
 }
+
 /* HTML5 display-role reset for older browsers */
-article, aside, details, figcaption, figure, 
-footer, header, hgroup, menu, nav, section, main {
-	display: block;
+
+article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, main {
+  display: block;
 }
+
 body {
-	line-height: 1;
+  line-height: 1;
 }
+
 ol, ul {
-	list-style: none;
+  list-style: none;
 }
+
 blockquote, q {
-	quotes: none;
+  quotes: none;
 }
-blockquote:before, blockquote:after,
-q:before, q:after {
-	content: '';
-	content: none;
+
+blockquote:before, blockquote:after, q:before, q:after {
+  content: '';
+  content: none;
 }
+
 table {
-	border-collapse: collapse;
-	border-spacing: 0;
+  border-collapse: collapse;
+  border-spacing: 0;
 }
-button{outline:none; border: none;}
-input::-webkit-outer-spin-button,input::-webkit-inner-spin-button{
-        -webkit-appearance:textfield;
+
+button {
+  outline: none;
+  border: none;
 }
-input[type="number"]{
-        -moz-appearance:textfield;
+
+input::-webkit-outer-spin-button, input::-webkit-inner-spin-button {
+  -webkit-appearance: textfield;
+}
+
+input[type="number"] {
+  -moz-appearance: textfield;
 }
+
 input:-webkit-autofill {
   -webkit-box-shadow: 0 0 0px 1000px white inset;
   -webkit-text-fill-color: #333;
 }
+
 a {
-	text-decoration: none;
+  text-decoration: none;
+}
+
+a:link, a:visited, a:hover, a:active {
+  color: #409eff
 }
-a:link,a:visited,a:hover,a:active {color: #409eff} 
 
 *, *::after, *::before {
   box-sizing: border-box;
 }
-.fl{float: left;}
-.fr{float: right;}
-.clearfix:after{content: "";display: block;clear: both;}
-.clearfix{zoom: 1;}
-
-::-webkit-scrollbar-track-piece {  
-    background-color:#ffffff;  
-}  
-::-webkit-scrollbar {  
-    width:8px;  
-    height:13px;  
-}  
-::-webkit-scrollbar-thumb {  
-    background-color:#e5e5e5;  
-    background-clip:padding-box;  
-    min-height:20px;  
-    border-radius: 3px;
-}  
-::-webkit-scrollbar-thumb:hover {  
-    background-color:#929292;  
-}  
+
+.fl {
+  float: left;
+}
+
+.fr {
+  float: right;
+}
+
+.clearfix:after {
+  content: "";
+  display: block;
+  clear: both;
+}
+
+.clearfix {
+  zoom: 1;
+}
+
+::-webkit-scrollbar-track-piece {
+  background-color: #ffffff;
+}
+
+::-webkit-scrollbar {
+  width: 8px;
+  height: 13px;
+}
+
+::-webkit-scrollbar-thumb {
+  background-color: #e5e5e5;
+  background-clip: padding-box;
+  min-height: 20px;
+  border-radius: 3px;
+}
+
+::-webkit-scrollbar-thumb:hover {
+  background-color: #929292;
+}
+
 /*html,body,h1,h2,h3,h4,h5,h6,div,dl,dt,dd,ul,ol,li,p,blockquote,pre,hr,figure,table,caption,th,td,form,fieldset,legend,input,button,textarea,menu{margin:0;padding:0;}
 header,footer,section,article,aside,nav,hgroup,address,figure,figcaption,menu,details{display:block;}
 table{border-collapse:collapse;border-spacing:0;}
@@ -108,7 +130,7 @@ body{background:#fff;}
 a,a:hover{color:#fff;}
 *{box-sizing: border-box}*/
 
-.el-input.is-active .el-input__inner, .el-input__inner:focus {
+/* .el-input.is-active .el-input__inner, .el-input__inner:focus {
   border-color: #09e1c0 !important;
 }
 .el-pager li.active {
@@ -129,7 +151,7 @@ a,a:hover{color:#fff;}
 
 .el-loading-spinner .path  {
   stroke: #09e1c0 !important
-}
+} */
 
 .table {
   border: none !important;
@@ -140,21 +162,22 @@ a,a:hover{color:#fff;}
   border-right: none !important;
   background-color: #fff !important;
 }
-table th,
-table td {
+
+table th, table td {
   border-left: none !important;
   border-right: none !important;
   text-align: center !important;
 }
+
 .table.el-table--enable-row-hover .el-table__body tr:hover>td {
   background-color: #fff;
 }
+
 .el-table--border::after, .el-table--group::after {
   display: none !important
 }
 
-.table.el-table thead.is-group th,
-.table.el-table thead th {
+.table.el-table thead.is-group th, .table.el-table thead th {
   background-color: #fff;
   color: #999999;
   font-weight: bold;
@@ -180,4 +203,16 @@ table td {
   color: #fff !important;
   border-color: #09e1c0 !important;
   background-color: #09e1c0 !important;
-}*/
+}*/
+
+input, input::-webkit-input-placeholder {
+  color: #999999;
+  font-size: 14px;
+  font-family: "微软雅黑";
+}
+
+textarea,textarea::-webkit-input-placeholder {
+  color: #999999;
+  font-size: 14px;
+  font-family: "微软雅黑";
+}

+ 5 - 1
src/page/edition/index.vue

@@ -47,10 +47,13 @@
     </div>
 
     <el-dialog width="750px" title="添加版本" :visible.sync="active">
-      <el-form v-if="active" label-width="80px">
+      <el-form v-if="active" label-width="100px">
         <el-form-item label="版本" width="100%">
           <el-input v-model="active.version"></el-input>
         </el-form-item>
+        <el-form-item label="最低版本号" width="100%">
+          <el-input v-model="active.minVersion"></el-input>
+        </el-form-item>
         <el-form-item label="描述" width="100%">
           <el-input type="textarea" v-model="active.description" :rows="5"></el-input>
         </el-form-item>
@@ -192,6 +195,7 @@ export default {
       var formData = new FormData()
       formData.append('version', this.active.version)
       formData.append('description', this.active.description)
+      formData.append('minVersion', this.active.minVersion)
       formData.append('file', this.$refs.file.files[0])
 
       await this.$http({

+ 19 - 19
src/page/invoice/index.vue

@@ -426,25 +426,25 @@ export default {
         // temp[i]['expressNum_input'] = "";
         temp[i].items = []
         temp[i]['typeStr'] = TypeArr[temp[i]['type']]
-        temp[i].orderItems = 
-          temp[i]['orderDetail'] ? temp[i]['orderDetail']['orderItems'] :
-          temp[i]['responseVirtualOrder'] ? [{
-            goodsName: temp[i]['responseVirtualOrder'].body,
-            goodsCount: temp[i]['responseVirtualOrder'].orderCount,
-            goodsPrice: temp[i]['responseVirtualOrder'].amount,
-            abroad: temp[i]['responseVirtualOrder'].abroad
-          }] : 
-          temp[i]['responseIncrementOrder'] ? [{
-            goodsName: '会员权益',
-            goodsCount: temp[i]['responseIncrementOrder'].count,
-            goodsPrice: temp[i]['responseIncrementOrder'].amount,
-            abroad: temp[i]['responseIncrementOrder'].abroad
-          }] : ''
-          
-        temp[i]['orderSn'] = 
-          temp[i]['orderDetail'] ? temp[i]['orderDetail']['orderSn'] : 
-          temp[i]['responseIncrementOrder'] ? temp[i]['responseIncrementOrder']['orderSn'] : 
-          temp[i]['responseVirtualOrder'] ? temp[i]['responseVirtualOrder']['orderSn'] : ''
+        temp[i].orderItems =
+          temp[i]['orderDetail'] ? temp[i]['orderDetail']['orderItems']
+            : temp[i]['responseVirtualOrder'] ? [{
+              goodsName: temp[i]['responseVirtualOrder'].body,
+              goodsCount: temp[i]['responseVirtualOrder'].orderCount,
+              goodsPrice: temp[i]['responseVirtualOrder'].amount,
+              abroad: temp[i]['responseVirtualOrder'].abroad
+            }]
+              : temp[i]['responseIncrementOrder'] ? [{
+                goodsName: '会员权益',
+                goodsCount: temp[i]['responseIncrementOrder'].count,
+                goodsPrice: temp[i]['responseIncrementOrder'].amount,
+                abroad: temp[i]['responseIncrementOrder'].abroad
+              }] : ''
+
+        temp[i]['orderSn'] =
+          temp[i]['orderDetail'] ? temp[i]['orderDetail']['orderSn']
+            : temp[i]['responseIncrementOrder'] ? temp[i]['responseIncrementOrder']['orderSn']
+              : temp[i]['responseVirtualOrder'] ? temp[i]['responseVirtualOrder']['orderSn'] : ''
       }
       this.orders = temp
       this.currentPage = page

+ 4 - 0
src/page/laserCamera/index.vue

@@ -51,6 +51,9 @@
         <el-form-item label="版本" width="100%">
           <el-input v-model="active.version"></el-input>
         </el-form-item>
+        <el-form-item label="最低版本号" width="100%">
+          <el-input v-model="active.minVersion"></el-input>
+        </el-form-item>
         <el-form-item label="描述" width="100%">
           <el-input type="textarea" v-model="active.description" :rows="5"></el-input>
         </el-form-item>
@@ -191,6 +194,7 @@ export default {
       formData.append('version', this.active.version)
       formData.append('type', this.type)
       formData.append('description', this.active.description)
+      formData.append('minVersion', this.active.minVersion)
       formData.append('file', this.$refs.file.files[0])
 
       await this.$http({

+ 2 - 2
src/page/layout/slide.vue

@@ -81,7 +81,7 @@ export default {
         text: 'SDK 发布管理',
         link: {name: 'sdkManage'},
         children: [
-          { text: 'Space target', link: {name: 'spaceTarget'}, top: 182 }
+          { text: 'SpaceTarget', link: {name: 'spaceTarget'}, top: 182 }
         ],
         top: 154
       },
@@ -94,7 +94,7 @@ export default {
       //   text: 'SDK 发布管理',
       //   link: {name: 'sdkManage'},
       //   children: [
-      //     { text: 'Space target', link: {name: 'sdkManage'}, top: 182 }
+      //     { text: 'SpaceTarget', link: {name: 'sdkManage'}, top: 182 }
       //   ],
       //   top: 154
       // }

+ 197 - 47
src/page/spaceTarget/index.vue

@@ -1,11 +1,20 @@
 <template>
   <div id="spaceTarget-management">
-    <div class="spaceTarget-management-body" v-loading.fullscreen.lock="fullscreenLoading">
+    <div
+      class="spaceTarget-management-body"
+      v-loading.fullscreen.lock="fullscreenLoading"
+    >
       <div class="order-management-body">
         <div class="order-management-inner">
           <div class="base-info">
-            <el-input style="width:220px;" v-model="searchKey" placeholder="输入版本号进行搜索"></el-input>
-            <el-button type="primary" @click="_searchOrderData(1)" color='red'>搜索</el-button>
+            <el-input
+              style="width: 220px"
+              v-model="searchKey"
+              placeholder="输入版本号进行搜索"
+            ></el-input>
+            <el-button type="primary" @click="_searchOrderData(1)" color="red"
+              >搜索</el-button
+            >
           </div>
         </div>
 
@@ -13,98 +22,224 @@
           <div class="order-management-table">
             <div class="order-check_tab">
               <ul>
-                <li v-for="(item,index) in tabs" :key="index" :class="{'order-check_tab_li_active':item.idx==tabIndex}" @click="clickTabItem(item.idx)">
-                  {{item.name}}<span v-if="item.idx != 2" style="margin:0 10px;color: #999;font-weight: normal;">/</span></li>
+                <li
+                  v-for="(item, index) in tabs"
+                  :key="index"
+                  :class="{ 'order-check_tab_li_active': item.idx == tabIndex }"
+                  @click="clickTabItem(item.idx)"
+                >
+                  {{ item.name
+                  }}<span
+                    v-if="item.idx != 2"
+                    style="margin: 0 10px; color: #999; font-weight: normal"
+                    >/</span
+                  >
+                </li>
               </ul>
-              <div style="float: right;vertical-align: middle;">
+              <div style="float: right; vertical-align: middle">
                 <!-- <el-select v-model="selectValue" placeholder="请选择">
                   <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
                   </el-option>
                 </el-select> -->
-                <el-button type="success" @click="openMarks" color='red'>上传</el-button>
+                <el-button type="success" @click="openMarks" color="red">上传</el-button>
               </div>
             </div>
-            <el-table cell-class-name="hh" ref="order_table" class='e-table' :data="orders" style="width: 100%">
+            <el-table
+              cell-class-name="hh"
+              ref="order_table"
+              class="e-table"
+              :data="orders"
+              style="width: 100%"
+            >
               <!-- <el-table-column type="index">
               </el-table-column> -->
-              <el-table-column :ref="item.label=='版本更新说明' ?'version_desc':''" :min-width="item.label=='版本更新说明' ?'200px':'100px'" v-for="(item,i) in tableHeader" :key="i" :prop="item.name" :label="item.label">
+              <el-table-column
+                :ref="item.label == '版本更新说明' ? 'version_desc' : ''"
+                :min-width="item.label == '版本更新说明' ? '200px' : '100px'"
+                v-for="(item, i) in tableHeader"
+                :key="i"
+                :prop="item.name"
+                :label="item.label"
+              >
                 <template slot-scope="scope">
-                  <span v-if="item.label=='状态'">
-                    <span v-if="scope.row.status==0">未发布</span>
-                    <span v-if="scope.row.status==1">已发布</span>
-                    <span v-if="scope.row.status==2">已下架</span>
+                  <span v-if="item.label == '状态'">
+                    <span v-if="scope.row.status == 1">已发布</span>
+
+                    <span v-if="scope.row.status == 0">未发布</span>
+                    <span v-if="scope.row.status == 2">已下架</span>
                   </span>
-                  <span v-if="item.label=='置顶'">
+                  <span v-if="item.label == '置顶'">
                     <span v-if="scope.row.isTop">是</span>
                     <span v-if="!scope.row.isTop">否</span>
                   </span>
                   <!-- <span v-if="item.label=='版本更新说明' && scope.row[item.name]!=''" :style="`max-width:${columnWidth}px;`" class="fixed_Box">
                     {{scope.row[item.name]}}
                   </span> -->
-                  <span v-if="item.label!='置顶' &&item.label!='状态'" class="desc">{{scope.row[item.name]||'-'}}</span>
-
+                  <span
+                    v-if="item.label != '置顶' && item.label != '状态'"
+                    class="desc"
+                    >{{ scope.row[item.name] || "-" }}</span
+                  >
                 </template>
               </el-table-column>
               <el-table-column label="操作" width="150px">
                 <template slot-scope="scope">
-                  <el-button type="text" @click="del(scope.row.id)" class="delete_btn">删除</el-button>
-                  <el-button type="text" @click="editRow(scope.row)" class="edit_btn">编辑</el-button>
-                  <el-button v-if="scope.row.status!=1" type="text" @click="pushData(scope.row.id)" class="edit_btn">发布</el-button>
-                  <el-button v-if="scope.row.status==1" :disabled="scope.row.isTop==1" type="text" @click="pushDown(scope.row.id)" class="edit_btn">下架</el-button>
+                  <el-button
+                    type="text"
+                    @click="del(scope.row.id)"
+                    class="delete_btn"
+                    :disabled="
+                      (scope.row.isTop == 1 && scope.row.status == 1) ||
+                      scope.row.status == 1
+                    "
+                    >删除</el-button
+                  >
+                  <el-button type="text" @click="editRow(scope.row)" class="edit_btn"
+                    >编辑</el-button
+                  >
+                  <el-button
+                    v-if="scope.row.status != 1"
+                    type="text"
+                    @click="pushData(scope.row.id)"
+                    class="edit_btn"
+                    >发布</el-button
+                  >
+                  <el-button
+                    v-if="scope.row.status == 1"
+                    :disabled="scope.row.isTop == 1 && scope.row.status == 1"
+                    type="text"
+                    @click="pushDown(scope.row.id)"
+                    class="edit_btn"
+                    >下架</el-button
+                  >
                 </template>
               </el-table-column>
-
             </el-table>
           </div>
           <div class="order-management-pagination">
-            <el-pagination @current-change="handleCurrentChange" :current-page.sync="currentPage" :page-size="10" layout="total, prev, pager, next, jumper" :total="total">
+            <el-pagination
+              @current-change="handleCurrentChange"
+              :current-page.sync="currentPage"
+              :page-size="10"
+              layout="total, prev, pager, next, jumper"
+              :total="total"
+            >
             </el-pagination>
           </div>
         </div>
-
       </div>
     </div>
-    <el-dialog width="750px" title="上传" :visible.sync="active" @close="close_dialog">
-
+    <el-dialog
+      width="750px"
+      title="上传"
+      :show-close="false"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :visible.sync="active"
+    >
       <el-form :model="ruleForm" ref="el_form" :rules="rules" label-width="100px">
         <el-form-item label="平台类型" width="100%">
-          <el-radio :disabled="(isEdit && ruleForm.platformType!=1) || loading" v-model="ruleForm.platformType" :label="1">Unity</el-radio>
-          <el-radio :disabled="(isEdit && ruleForm.platformType!=2) || loading" v-model="ruleForm.platformType" :label="2">UE4</el-radio>
+          <el-radio
+            :disabled="(isEdit && ruleForm.platformType != 1) || loading"
+            v-model="ruleForm.platformType"
+            :label="1"
+            >Unity</el-radio
+          >
+          <el-radio
+            :disabled="(isEdit && ruleForm.platformType != 2) || loading"
+            v-model="ruleForm.platformType"
+            :label="2"
+            >UE4</el-radio
+          >
         </el-form-item>
         <el-form-item label="版本号" width="100%" prop="version">
-          <el-input placeholder="请输入数字、英文或符号" :disabled="isEdit || loading" v-model="ruleForm.version"></el-input>
+          <el-input
+            @input="limitInput"
+            placeholder="请输入数字、英文或符号"
+            :disabled="isEdit || loading"
+            v-model="ruleForm.version"
+          ></el-input>
         </el-form-item>
         <el-form-item label="版本更新说明" width="100%">
-          <span @click="chooseDescType(1)" class="sdkdesc " :class="descType==1?'active':''">CH</span>
-          <span @click="chooseDescType(2)" class="sdkdesc " :class="descType==2?'active':''">EH</span>
-          <el-input :disabled="loading" placeholder="请输入中文版本更新说明" v-if="descType==1" type="textarea" maxlength="200" resize="none" v-model="ruleForm.imprintCh" :rows="5"></el-input>
+          <span
+            @click="chooseDescType(1)"
+            class="sdkdesc"
+            :class="descType == 1 ? 'active' : ''"
+            >CH</span
+          >
+          <span
+            @click="chooseDescType(2)"
+            class="sdkdesc"
+            :class="descType == 2 ? 'active' : ''"
+            >EH</span
+          >
+          <el-input
+            :disabled="loading"
+            placeholder="请输入中文版本更新说明"
+            v-if="descType == 1"
+            type="textarea"
+            maxlength="200"
+            resize="none"
+            v-model="ruleForm.imprintCh"
+            :rows="5"
+          ></el-input>
 
-          <el-input :disabled="loading" placeholder="请输入英文版本更新说明" v-else type="textarea" maxlength="200" resize="none" v-model="ruleForm.imprintEn" :rows="5"></el-input>
+          <el-input
+            :disabled="loading"
+            placeholder="请输入英文版本更新说明"
+            v-else
+            type="textarea"
+            maxlength="200"
+            resize="none"
+            v-model="ruleForm.imprintEn"
+            :rows="5"
+          ></el-input>
         </el-form-item>
         <el-form-item ref="uploadFile" label="文件" width="100%" prop="file">
-          <p v-if="isEdit"><i class="el-icon-paperclip" style="margin-right:10px;"></i>{{ruleForm.fileName}}</p>
+          <p v-if="isEdit">
+            <i class="el-icon-paperclip" style="margin-right: 10px"></i
+            >{{ ruleForm.fileName }}
+          </p>
           <div v-else class="upload-file">
             <el-button type="primary" :disabled="loading">文件上传</el-button>
-            <input type="file" :disabled="loading" @change="changeFile($event)" ref="file">
-            <p v-if="ruleForm.file!=''"><i class="el-icon-paperclip" style="margin-right:10px;"></i>{{ruleForm.file.name}}</p>
+            <input
+              type="file"
+              :disabled="loading"
+              @change="changeFile($event)"
+              ref="file"
+            />
+            <p v-if="ruleForm.file != ''">
+              <i class="el-icon-paperclip" style="margin-right: 10px"></i
+              >{{ ruleForm.file.name }}
+            </p>
             <el-progress v-if="loading" :percentage="complete"></el-progress>
           </div>
         </el-form-item>
         <el-form-item label="官网置顶" width="100%">
-          <el-checkbox :disabled="loading" v-model="ruleForm.isTop">(勾选此项,将在四维看看官网置顶)</el-checkbox>
+          <el-checkbox :disabled="loading" v-model="ruleForm.isTop"
+            >(勾选此项,将在四维看看官网置顶)</el-checkbox
+          >
         </el-form-item>
-
       </el-form>
       <div slot="footer" class="dialog-footer">
         <div class="bottomBox">
-          <span class="editLastTime" v-show="isEdit">上次编辑:{{ruleForm.updateTime}}</span>
+          <span class="editLastTime" v-show="isEdit"
+            >上次编辑:{{ ruleForm.updateTime }}</span
+          >
           <div class="bottomBtn">
             <el-button @click="close_dialog">取 消</el-button>
-            <el-button v-if="!isEdit" type="primary" :loading="loading" @click="uploadMaker">确 定</el-button>
-            <el-button v-else type="primary" :loading="loading" @click="updateMaker">确 定</el-button>
+            <el-button
+              v-if="!isEdit"
+              type="primary"
+              :loading="loading"
+              @click="uploadMaker"
+              >确 定</el-button
+            >
+            <el-button v-else type="primary" :loading="loading" @click="updateMaker"
+              >确 定</el-button
+            >
           </div>
         </div>
-
       </div>
     </el-dialog>
   </div>
@@ -120,7 +255,7 @@ const tableHeader = [
     label: '版本更新说明'
   },
   {
-    name: 'createTime',
+    name: 'publishTime',
     label: '首次发布时间'
   },
   {
@@ -160,9 +295,7 @@ export default {
         isTop: false
       },
       rules: {
-        version: [
-          { required: true, message: '版本号不能为空', trigger: 'blur' }
-        ],
+        version: [{ required: true, message: '版本号不能为空', trigger: 'blur' }],
         file: [{ required: true, validator: validateFile, trigger: 'change' }]
       },
       isEdit: false,
@@ -219,6 +352,12 @@ export default {
   },
   watch: {},
   methods: {
+    limitInput () {
+      this.ruleForm.version = this.ruleForm.version.replace(
+        /[\u4E00-\u9FA5]|[\uFE30-\uFFA0]/g,
+        ''
+      )
+    },
     openMarks () {
       this.active = true
       this.descType = 1
@@ -230,6 +369,7 @@ export default {
       let res = JSON.stringify(data)
 
       this.ruleForm = JSON.parse(res)
+      this.ruleForm.platformType = this.ruleForm.platformType - 0
       if (this.ruleForm.isTop == 1) {
         this.ruleForm.isTop = true
       } else {
@@ -239,6 +379,9 @@ export default {
       this.active = true
     },
     close_dialog () {
+      if (!this.isEdit) {
+        this.$refs.file.value = ''
+      }
       this.$refs['el_form'].clearValidate()
       this.$refs['el_form'].resetFields()
       this.isEdit = false
@@ -360,8 +503,7 @@ export default {
               method: 'post',
               data: formData,
               onUploadProgress: (progressEvent) => {
-                this.complete =
-                  ((progressEvent.loaded / progressEvent.total) * 100) | 0
+                this.complete = ((progressEvent.loaded / progressEvent.total) * 100) | 0
                 console.log('上传 ' + this.complete)
               },
               processData: false,
@@ -386,6 +528,7 @@ export default {
           }
 
           this.active = false
+          this.$refs.file.value = ''
           this._searchOrderData(1)
         }
       } catch (err) {}
@@ -451,6 +594,7 @@ export default {
       this.currentPage = 1
       this.status = this.tabIndex === -1 ? null : this.tabIndex
       this.searchKey = ''
+      this.ruleForm.platformType = this.tabIndex
       // if (
       //   !this.searchDate ||
       //   this.expressNum ||
@@ -545,10 +689,16 @@ export default {
 .edit_btn span {
   color: #09e1c0;
 }
+.edit_btn.is-disabled span {
+  color: #999;
+}
 
 .delete_btn span {
   color: #f56c6c;
 }
+.delete_btn.is-disabled span {
+  color: #999;
+}
 .el-table .el-table__body tr td:nth-of-type(2) {
   position: relative;
 }

+ 4 - 0
src/page/turntableCamera/index.vue

@@ -51,6 +51,9 @@
         <el-form-item label="版本" width="100%">
           <el-input v-model="active.version"></el-input>
         </el-form-item>
+        <el-form-item label="最低版本号" width="100%">
+          <el-input v-model="active.minVersion"></el-input>
+        </el-form-item>
         <el-form-item label="描述" width="100%">
           <el-input type="textarea" v-model="active.description" :rows="5"></el-input>
         </el-form-item>
@@ -207,6 +210,7 @@ export default {
       formData.append('version', this.active.version)
       formData.append('type', this.type)
       formData.append('description', this.active.description)
+      formData.append('minVersion', this.active.minVersion)
       formData.append('file', this.$refs.file.files[0])
 
       await this.$http({

+ 2 - 2
src/router/index.js

@@ -143,7 +143,7 @@ export default new Router({
           name: 'userList',
           component: require('@/page/userList/userList').default,
           meta: { text: '用户列表' }
-        },  {
+        }, {
           path: '/oplog',
           name: 'oplog',
           component: require('@/page/oplog/oplog').default,
@@ -154,7 +154,7 @@ export default new Router({
           name: 'spaceTarget',
           component: require('@/page/spaceTarget').default,
           meta: {
-            text: 'Space target'
+            text: 'SpaceTarget'
           }
         },
         {