Ver código fonte

抖音小程序组件为easymon模式

zhangyujun 3 anos atrás
pai
commit
8dead45105

+ 83 - 47
package-lock.json

@@ -10723,21 +10723,19 @@
       }
     },
     "less": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/less/-/less-4.1.2.tgz",
-      "integrity": "sha512-EoQp/Et7OSOVu0aJknJOtlXZsnr8XE8KwuzTHOLeVSEx8pVWUICc8Q0VYRHgzyjX78nMEyC/oztWFbgyhtNfDA==",
+      "version": "3.12.2",
+      "resolved": "https://registry.npmjs.org/less/-/less-3.12.2.tgz",
+      "integrity": "sha512-+1V2PCMFkL+OIj2/HrtrvZw0BC0sYLMICJfbQjuj/K8CEnlrFX6R5cKKgzzttsZDHyxQNL1jqMREjKN3ja/E3Q==",
       "dev": true,
       "requires": {
-        "copy-anything": "^2.0.1",
         "errno": "^0.1.1",
         "graceful-fs": "^4.1.2",
         "image-size": "~0.5.0",
         "make-dir": "^2.1.0",
         "mime": "^1.4.1",
-        "needle": "^2.5.2",
-        "parse-node-version": "^1.0.1",
+        "native-request": "^1.0.5",
         "source-map": "~0.6.0",
-        "tslib": "^2.3.0"
+        "tslib": "^1.10.0"
       },
       "dependencies": {
         "mime": {
@@ -10748,27 +10746,88 @@
           "optional": true
         },
         "tslib": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
           "dev": true
         }
       }
     },
     "less-loader": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-5.0.0.tgz",
-      "integrity": "sha512-bquCU89mO/yWLaUq0Clk7qCsKhsF/TZpJUzETRvJa9KSVEL9SO3ovCvdEHISBhrC81OwC8QSVX7E0bzElZj9cg==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-6.2.0.tgz",
+      "integrity": "sha512-Cl5h95/Pz/PWub/tCBgT1oNMFeH1WTD33piG80jn5jr12T4XbxZcjThwNXDQ7AG649WEynuIzO4b0+2Tn9Qolg==",
+      "dev": true,
       "requires": {
-        "clone": "^2.1.1",
-        "loader-utils": "^1.1.0",
-        "pify": "^4.0.1"
+        "clone": "^2.1.2",
+        "less": "^3.11.3",
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^2.7.0"
       },
       "dependencies": {
         "clone": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-          "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18="
+          "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
+          "dev": true
+        },
+        "json5": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
+          "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
+          "dev": true
+        },
+        "less": {
+          "version": "3.13.1",
+          "resolved": "https://registry.npmjs.org/less/-/less-3.13.1.tgz",
+          "integrity": "sha512-SwA1aQXGUvp+P5XdZslUOhhLnClSLIjWvJhmd+Vgib5BFIr9lMNlQwmwUNOjXThF/A0x+MCYYPeWEfeWiLRnTw==",
+          "dev": true,
+          "requires": {
+            "copy-anything": "^2.0.1",
+            "errno": "^0.1.1",
+            "graceful-fs": "^4.1.2",
+            "image-size": "~0.5.0",
+            "make-dir": "^2.1.0",
+            "mime": "^1.4.1",
+            "native-request": "^1.0.5",
+            "source-map": "~0.6.0",
+            "tslib": "^1.10.0"
+          }
+        },
+        "loader-utils": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
+          "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
+        "mime": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+          "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+          "dev": true,
+          "optional": true
+        },
+        "schema-utils": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+          "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.5",
+            "ajv": "^6.12.4",
+            "ajv-keywords": "^3.5.2"
+          }
+        },
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true
         }
       }
     },
@@ -11430,36 +11489,19 @@
         "to-regex": "^3.0.1"
       }
     },
+    "native-request": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/native-request/-/native-request-1.1.0.tgz",
+      "integrity": "sha512-uZ5rQaeRn15XmpgE0xoPL8YWqcX90VtCFglYwAgkvKM5e8fog+vePLAhHxuuv/gRkrQxIeh5U3q9sMNUrENqWw==",
+      "dev": true,
+      "optional": true
+    },
     "natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npm.taobao.org/natural-compare/download/natural-compare-1.4.0.tgz",
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
       "dev": true
     },
-    "needle": {
-      "version": "2.9.1",
-      "resolved": "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz",
-      "integrity": "sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "debug": "^3.2.6",
-        "iconv-lite": "^0.4.4",
-        "sax": "^1.2.4"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        }
-      }
-    },
     "negotiator": {
       "version": "0.6.2",
       "resolved": "https://registry.npm.taobao.org/negotiator/download/negotiator-0.6.2.tgz?cache=0&sync_timestamp=1589682752355&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnegotiator%2Fdownload%2Fnegotiator-0.6.2.tgz",
@@ -12105,12 +12147,6 @@
         "lines-and-columns": "^1.1.6"
       }
     },
-    "parse-node-version": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
-      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
-      "dev": true
-    },
     "parse5": {
       "version": "5.1.1",
       "resolved": "https://registry.npm.taobao.org/parse5/download/parse5-5.1.1.tgz",

+ 2 - 2
package.json

@@ -64,7 +64,6 @@
     "crypto-js": "^4.0.0",
     "dayjs": "^1.10.5",
     "flyio": "^0.6.2",
-    "less-loader": "^5.0.0",
     "mockjs": "^1.1.0",
     "node-sass": "^4.14.1",
     "qrcode": "^1.4.4",
@@ -93,7 +92,8 @@
     "babel-plugin-import": "^1.11.0",
     "cross-env": "^7.0.2",
     "jest": "^25.4.0",
-    "less": "^4.1.2",
+    "less": "^3.12.2",
+    "less-loader": "^6.2.0",
     "mini-types": "*",
     "miniprogram-api-typings": "*",
     "postcss-comment": "^2.0.0",

+ 1 - 1
src/App.vue

@@ -50,7 +50,7 @@ export default {
 
 <style lang="less">
 /* #ifdef MP-TOUTIAO */
-/* @import 'vant-weapp-convert-uniapp/common/index.less'; */
+
 /* #endif  */
 /* #ifdef MP-WEIXIN */
 @import "@/wxcomponents/vant/common/index.wxss";

+ 1 - 1
src/api/modules/open.js

@@ -1,6 +1,6 @@
 import request from '../request'
 //金牌车教的open api
-const openBaseUrl1 = process.env.NODE_ENV==='development'?"https://jpcj-admin1.zzxcx.net/twzd-admin/open-api":"https://jpcj-admin.zzxcx.net/twzd-admin/open-api"
+// const openBaseUrl1 = process.env.NODE_ENV==='development'?"https://jpcj-admin1.zzxcx.net/twzd-admin/open-api":"https://jpcj-admin.zzxcx.net/twzd-admin/open-api"
 const open = {
     //open-api/teachingVideo/info/treeList
     //获取视频列表

+ 1 - 1
src/api/modules/user.js

@@ -16,7 +16,7 @@ const user = {
 		
 		console.log(res)
 		return request({
-			url: `${process.env.NODE_ENV==='development'?'https://jpcj-admin1.zzxcx.net/twzd-admin':'https://jpcj-admin.zzxcx.net/twzd-admin'}/login/jscode`,
+			url: `/login/jscode`,
 			method: 'post',
 			params: {
 				jscode: res.code

+ 1 - 1
src/api/request.js

@@ -11,7 +11,7 @@ const baseUrl = 'https://zzjs.zzxcx.net/prod-api';
 // 创建axios实例
 const service = axios.create({
 	// axios中请求配置有baseURL选项,表示请求URL公共部分
-	baseURL: process.env.NODE_ENV==='development'?'https://jpcj-admin1.zzxcx.net/twzd-admin':'https://jpcj-admin.zzxcx.net/twzd-admin',
+	baseURL: process.env.NODE_ENV==='development'?'https://jpcj-admin1.zzxcx.net/stage-api':'https://jpcj-admin.zzxcx.net/prod-api',
 	// baseURL: baseUrl,
 })
 mock.init(service)

+ 2 - 2
src/main.js

@@ -6,7 +6,7 @@ import store from '@/store'
 import utils from '@/utils'
 //引入所有接口函数
 import api from '@/api'
-
+import 'vant-weapp-convert-uniapp/components/common/index.less'
 Vue.config.productionTip = false
 App.mpType = 'app'
 
@@ -21,4 +21,4 @@ const app = new Vue({
 	store,
 	...App
 })
-app.$mount()
+app.$mount()

+ 4 - 0
src/otherPages/exercise/index.vue

@@ -47,6 +47,7 @@
                 'problem-op_selected': item.selected,
               }"
               slot="icon"
+              name="icon"
               >{{ numberToLetter(index) }}</view
             >
           </van-radio>
@@ -117,6 +118,7 @@
                 ].userAnswer.includes(item.value),
               }"
               slot="icon"
+              name="icon"
               >{{ numberToLetter(index) }}</view
             >
           </van-checkbox>
@@ -732,6 +734,8 @@ export default {
     .problem-img {
       width: 100%;
       margin-top: 20rpx;
+      display: flex;
+      justify-content: center;
       image {
         margin: 0 auto;
       }

+ 2 - 0
src/otherPages/mockExam/index.vue

@@ -506,6 +506,8 @@ export default {
     .problem-img {
       width: 100%;
       margin-top: 20rpx;
+      display: flex;
+      justify-content: center;
       image {
         margin: 0 auto;
       }

+ 5 - 0
src/pages.json

@@ -358,6 +358,11 @@
         "path": "otherPages/mockExamEnd/index",
         "query": "liceCar=1&liceTruck=&liceBus=&liceMoto=&name=科目一&cert=C1/C2/C3&vehicle=轿车&subject=1&title=模拟考试&sort=3"
       },
+      {
+        "name": "查看成绩",
+        "path": "otherPages/testScores/index",
+        "query": "liceCar=1&liceTruck=&liceBus=&liceMoto=&name=科目一&cert=C1/C2/C3&vehicle=轿车&subject=4&title=顺序练习&sort=3&excellIssueName=新增题库"
+      },
       {
         "name": "练习",
         "path": "otherPages/exercise/index",

Diferenças do arquivo suprimidas por serem muito extensas
+ 12 - 0
src/ttcomponents/common/main.ttss


Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff