Merge branch 'v1.0.0' into v1.0.0_jd

.gitignore

@@ -2,3 +2,4 @@ unpackage/
 .hbuilderx/
 .idea/
 .vscode/
+node_modules
\ No newline at end of file

package-lock.json

+{
+    "name": "表单 动态表单 uniapp最强动态表单 表单校验 快速生成表单 全端支持",
+    "version": "1.1.0",
+    "lockfileVersion": 2,
+    "requires": true,
+    "packages": {
+        "": {
+            "name": "表单 动态表单 uniapp最强动态表单 表单校验 快速生成表单 全端支持",
+            "version": "1.1.0",
+            "dependencies": {
+                "crypto-js": "^4.1.1"
+            }
+        },
+        "node_modules/crypto-js": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz",
+            "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="
+        }
+    },
+    "dependencies": {
+        "crypto-js": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz",
+            "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="
+        }
+    }
+}

package.json

@@ -9,5 +9,8 @@
         "表单校验",
         "快速生成表单",
         "全端"
-    ]
+    ],
+    "dependencies": {
+        "crypto-js": "^4.1.1"
+    }
 }

pages/binding/index.vue

@@ -80,7 +80,7 @@
 			//检查挪车码存在、是否绑定
 			getCheckMoveCode() {
 				let opts = {
-					url: '/app/user/check/move/code',
+					url: '/app/user/c/m/c',
 					method: 'post'
 				};
 				this.http.httpTokenRequest(opts, {
@@ -170,7 +170,7 @@
 								code: this.scene
 							}
 							opts = {
-								url: '/app/user/check/move/code',
+								url: '/app/user/c/m/c',
 								method: 'post'
 							}
 							that.http.httpTokenRequest(opts, param).then(res => {
@@ -306,7 +306,7 @@
 								code: this.scene
 							}
 							opts = {
-								url: '/app/user/check/move/code',
+								url: '/app/user/c/m/c',
 								method: 'post'
 							}
 							that.http.httpTokenRequest(opts, param).then(res => {

pages/binding/moveCar.vue

@@ -81,7 +81,7 @@ export default {
                                         code: scene
                                     }
                                     let opts = {
-                                        url: '/app/user/check/move/code',
+                                        url: '/app/user/c/m/c',
                                         method: 'post'
                                     }
 

pages/main.vue

@@ -115,7 +115,7 @@
 																code: scene
 															}
 															let opts = {
-																url: '/app/user/check/move/code',
+																url: '/app/user/c/m/c',
 																method: 'post'
 															}
 															that.http.httpTokenRequest(opts, param).then(
@@ -329,7 +329,7 @@
 										//获取二维码携带的参数
 										//扫码后得到的参数
 										that.http.httpTokenRequest({
-											url: '/app/user/check/move/code',
+											url: '/app/user/c/m/c',
 											method: 'post'
 										}, {
 											code: that.scene
@@ -385,7 +385,7 @@
 					that.scene = decodeURIComponent(option.scene)
 					uni.setStorageSync('scene', that.scene)
 					that.http.httpTokenRequest({
-						url: '/app/user/check/move/code',
+						url: '/app/user/c/m/c',
 						method: 'post'
 					}, {
 						code: that.scene

pages/moveCar.vue

@@ -91,7 +91,7 @@
 											code: scene
 										}
 										let opts = {
-											url: '/app/user/check/move/code',
+											url: '/app/user/c/m/c',
 											method: 'post'
 										}