SpaceOfCheng
/
admin
Segui 3
Vota 0
Forka 0
Codice Problemi 0 Pull Requests 0 Rilasci 2 Activity
Sfoglia il codice sorgente

Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/admin into dev

wangfei 6 anni fa
parent
fb65881300 99349eeb47
commit
9fe1b0bfc5
7 ha cambiato i file con 51 aggiunte e 16 eliminazioni
Visualizzazione unificata Mostra Diff Stats
  1. 1
    1
      dist/index.html
  2. 11
    2
      src/pages/system/cmsManager/indexMsg/add.vue
  3. 11
    2
      src/pages/system/cmsManager/indexMsg/edit.vue
  4. 11
    2
      src/pages/system/cmsManager/newsManager/add.vue
  5. 11
    2
      src/pages/system/cmsManager/newsManager/edit.vue
  6. 6
    6
      src/pages/system/courseManager/fiveA/index.vue
  7. 0
    1
      src/pages/system/newOrder/newOrderList/index.vue

+ 1
- 1
dist/index.html Vedi File

1 
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><title>城的空间后台管理系统</title><link href=./static/css/app.74e2f4a85378fd8f1cdc28df9fe4c4c3.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.992319e39e0ff64940a3.js></script><script type=text/javascript src=./static/js/app.40d79b6e7915c878f744.js></script></body></html>
1 
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><title>城的空间后台管理系统</title><link href=./static/css/app.da6f5d0be226c62d85ab6affc245d329.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.992319e39e0ff64940a3.js></script><script type=text/javascript src=./static/js/app.01455eb793de834a6b0b.js></script></body></html>

+ 11
- 2
src/pages/system/cmsManager/indexMsg/add.vue Vedi File

101 
           })
101 
           })
102 
           return false
102 
           return false
103 
         }
103 
         }
104 
-        var reg = /^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(([A-Za-z0-9-~]+)\.)+([A-Za-z0-9-~\/])+$/  // eslint-disable-line
105 
-        if (!reg.test(this.postData.InfoUrl)) {
104 
+        // var reg = /^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(([A-Za-z0-9-~]+)\.)+([A-Za-z0-9-~\/])+$/  // eslint-disable-line
105 
+        // if (!reg.test(this.postData.InfoUrl)) {
106 
+        //   this.$message({
107 
+        //     message: '链接地址格式不正确',
108 
+        //     type: 'error',
109 
+        //   })
110 
+        //   return false
111 
+        // }
112 
+        var strRegex = '^((https|http|ftp|rtsp|mms)://)?[a-z0-9A-Z]{3}\.[a-z0-9A-Z][a-z0-9A-Z]{0,61}?[a-z0-9A-Z]\.com|net|cn|cc (:s[0-9]{1-4})?/$'  // eslint-disable-line
113 
+        var re = new RegExp(strRegex)
114 
+        if (!re.test(this.postData.InfoUrl)) {
106 
           this.$message({
115 
           this.$message({
107 
             message: '链接地址格式不正确',
116 
             message: '链接地址格式不正确',
108 
             type: 'error',
117 
             type: 'error',

+ 11
- 2
src/pages/system/cmsManager/indexMsg/edit.vue Vedi File

97 
           })
97 
           })
98 
           return false
98 
           return false
99 
         }
99 
         }
100 
-        var reg = /^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(([A-Za-z0-9-~]+)\.)+([A-Za-z0-9-~\/])+$/  // eslint-disable-line
101 
-        if (!reg.test(this.postData.InfoUrl)) {
100 
+        // var reg = /^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(([A-Za-z0-9-~]+)\.)+([A-Za-z0-9-~\/])+$/  // eslint-disable-line
101 
+        // if (!reg.test(this.postData.InfoUrl)) {
102 
+        //   this.$message({
103 
+        //     message: '链接地址格式不正确',
104 
+        //     type: 'error',
105 
+        //   })
106 
+        //   return false
107 
+        // }
108 
+        var strRegex = '^((https|http|ftp|rtsp|mms)://)?[a-z0-9A-Z]{3}\.[a-z0-9A-Z][a-z0-9A-Z]{0,61}?[a-z0-9A-Z]\.com|net|cn|cc (:s[0-9]{1-4})?/$'  // eslint-disable-line
109 
+        var re = new RegExp(strRegex)
110 
+        if (!re.test(this.postData.InfoUrl)) {
102 
           this.$message({
111 
           this.$message({
103 
             message: '链接地址格式不正确',
112 
             message: '链接地址格式不正确',
104 
             type: 'error',
113 
             type: 'error',

+ 11
- 2
src/pages/system/cmsManager/newsManager/add.vue Vedi File

161 
           })
161 
           })
162 
           return false
162 
           return false
163 
         } else {
163 
         } else {
164 
-          var reg = /^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(([A-Za-z0-9-~]+)\.)+([A-Za-z0-9-~\/])+$/  // eslint-disable-line
165 
-          if (!reg.test(this.postData.ForwardUrl)) {
164 
+          // var reg = /^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(([A-Za-z0-9-~]+)\.)+([A-Za-z0-9-~\/])+$/  // eslint-disable-line
165 
+          // if (!reg.test(this.postData.ForwardUrl)) {
166 
+          //   this.$message({
167 
+          //     message: '链接地址格式不正确',
168 
+          //     type: 'error',
169 
+          //   })
170 
+          //   return false
171 
+          // }
172 
+          var strRegex = '^((https|http|ftp|rtsp|mms)://)?[a-z0-9A-Z]{3}\.[a-z0-9A-Z][a-z0-9A-Z]{0,61}?[a-z0-9A-Z]\.com|net|cn|cc (:s[0-9]{1-4})?/$'  // eslint-disable-line
173 
+          var re = new RegExp(strRegex)
174 
+          if (!re.test(this.postData.ForwardUrl)) {
166 
             this.$message({
175 
             this.$message({
167 
               message: '链接地址格式不正确',
176 
               message: '链接地址格式不正确',
168 
               type: 'error',
177 
               type: 'error',

+ 11
- 2
src/pages/system/cmsManager/newsManager/edit.vue Vedi File

152 
           })
152 
           })
153 
           return false
153 
           return false
154 
         } else {
154 
         } else {
155 
-          var reg = /^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(([A-Za-z0-9-~]+)\.)+([A-Za-z0-9-~\/])+$/  // eslint-disable-line
156 
-          if (!reg.test(this.postData.ForwardUrl)) {
155 
+          // var reg = /^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(([A-Za-z0-9-~]+)\.)+([A-Za-z0-9-~\/])+$/  // eslint-disable-line
156 
+          // if (!reg.test(this.postData.ForwardUrl)) {
157 
+          //   this.$message({
158 
+          //     message: '链接地址格式不正确',
159 
+          //     type: 'error',
160 
+          //   })
161 
+          //   return false
162 
+          // }
163 
+          var strRegex = '^((https|http|ftp|rtsp|mms)://)?[a-z0-9A-Z]{3}\.[a-z0-9A-Z][a-z0-9A-Z]{0,61}?[a-z0-9A-Z]\.com|net|cn|cc (:s[0-9]{1-4})?/$'  // eslint-disable-line
164 
+          var re = new RegExp(strRegex)
165 
+          if (!re.test(this.postData.ForwardUrl)) {
157 
             this.$message({
166 
             this.$message({
158 
               message: '链接地址格式不正确',
167 
               message: '链接地址格式不正确',
159 
               type: 'error',
168 
               type: 'error',

+ 6
- 6
src/pages/system/courseManager/fiveA/index.vue Vedi File

47 
               <el-button
47 
               <el-button
48 
               size="mini"
48 
               size="mini"
49 
               type="primary"
49 
               type="primary"
50 
-              v-if="scope.row.OrderNo !== 1 && tableData.length > 1"
50 
+              v-if="scope.$index !== 0 && tableData.length > 1"
51 
               @click="orderChange(scope.$index, scope.row, 'up')">上移</el-button>
51 
               @click="orderChange(scope.$index, scope.row, 'up')">上移</el-button>
52 
               <el-button
52 
               <el-button
53 
               size="mini"
53 
               size="mini"
54 
               type="success"
54 
               type="success"
55 
-              v-if="scope.row.OrderNo !== tableData.length && tableData.length > 1 && scope.row.index !== (tableData.length - 1)"
55 
+              v-if="tableData.length > 1 && scope.row.index !== (tableData.length - 1)"
56 
               @click="orderChange(scope.$index, scope.row, 'down')">下移</el-button>
56 
               @click="orderChange(scope.$index, scope.row, 'down')">下移</el-button>
57 
           </template>
57 
           </template>
58 
         </el-table-column>
58 
         </el-table-column>
59 
       </el-table>
59 
       </el-table>
60 
     </div>
60 
     </div>
61 
-    <el-pagination
61 
+    <!-- <el-pagination
62 
       @current-change="handleCurrentChange"
62 
       @current-change="handleCurrentChange"
63 
       :current-page.sync="postData.currentPage"
63 
       :current-page.sync="postData.currentPage"
64 
       :page-size="postData.pageSize"
64 
       :page-size="postData.pageSize"
65 
       layout="prev, pager, next, jumper"
65 
       layout="prev, pager, next, jumper"
66 
       :total="postData.total">
66 
       :total="postData.total">
67 
-    </el-pagination>
67 
+    </el-pagination> -->
68 
   </div>
68 
   </div>
69 
 </template>
69 
 </template>
70
70
78 
     return {
78 
     return {
79 
       postData: {
79 
       postData: {
80 
         currentPage: 1, // 当前页码
80 
         currentPage: 1, // 当前页码
81 
-        pageSize: 10,
82 
-        total: 0,
81 
+        pageSize: 100,
82 
+        total: 1,
83 
       },
83 
       },
84 
       tableData: []
84 
       tableData: []
85 
     }
85 
     }

+ 0
- 1
src/pages/system/newOrder/newOrderList/index.vue Vedi File

155 
           if (param.length && bool) {
155 
           if (param.length && bool) {
156 
             bool = false
156 
             bool = false
157 
             this.printPdf(`item_${param[0]}`)
157 
             this.printPdf(`item_${param[0]}`)
158 
-            console.log(param[0])
159 
             this.putPrintGoodsOrder({
158 
             this.putPrintGoodsOrder({
160 
               id: param[0]
159 
               id: param[0]
161 
             }).then(() => {
160 
             }).then(() => {