Merge branch 'master' of http://git.sjzkeji.com/panghu/school_webUser

pages-address/edit-add.vue

@@ -8,7 +8,7 @@
 				<EnInput label="收货人" placeholder="请输入收货人姓名" v-model="fromData.consignee"></EnInput>
 				<EnInput label="电话号码" type="number" placeholder="请输入电话号码" v-model="fromData.phone"></EnInput>
 
-				<EnSelect label="收货学校" placeholder="请选择收货学校" v-model="fromData.school_id" 
+				<EnSelect v-if="schoolList.length > 0" label="收货学校" placeholder="请选择收货学校" v-model="fromData.school_id" 
 				:localData="schoolList" :valueType="'1'" ></EnSelect>
 				
 				<EnSelect label="楼栋" placeholder="请选择楼栋" v-if="fromData.school_id" v-model="fromData.dorm_id" 
@@ -74,6 +74,8 @@
 				schoolList: [],
 				builList:[],
 				isAJAX: false,
+				
+				time:'',
 			}
 		},
 		onLoad(e) {
@@ -94,8 +96,8 @@
 				getAddressInfo({id:id}).then((res)=>{
 					if(res.code === 1){
 						this.fromData = res.data;
-						this.fromData.school_id = res.data.school_id + ''
-						this.fromData.dorm_id = res.data.dorm_id + ''
+						this.fromData.school_id = res.data.school_id + '';
+						this.fromData.dorm_id = res.data.dorm_id + '';
 					}
 				})
 			},
@@ -105,9 +107,8 @@
 					if(res.code === 1){
 						this.schoolList = res.data.map(obj =>{
 							const {school_id,school_name} = obj;
-							return {value:school_id,text:school_name};
+							return {value:school_id + '',text:school_name};
 						});
-						
 					}
 				})
 			},
@@ -116,12 +117,14 @@
 					if(res.code === 1){
 						this.builList = res.data.map(obj =>{
 							const {dorm_id,name} = obj;
-							return {value:dorm_id,text:name};
+							return {value:dorm_id + '',text:name};
 						});
 					}
 				})
 			},
 			save() {
+				console.log(this.fromData);
+				return
 				if(this.isAJAX){
 					return
 				}

pages/order/index.vue

@@ -161,14 +161,14 @@
 		<uni-popup ref="popup" border-radius="10px 10px 10px 10px" @maskClick=maskClick>
 			<view class="bgc-f b-rad-20">
 				<!-- <UniQrcode :text="qrcodeData"></UniQrcode> -->
-				<uv-qrcode class="b-rad-20" ref="qrcode" :value="qrcodeData" :options="options2"></uv-qrcode>
+				<!-- <uv-qrcode class="b-rad-20" ref="qrcode" :value="qrcodeData" :options="options2"></uv-qrcode> -->
 			</view>
 		</uni-popup>
 	</view>
 </template>
 
 <script>
-	import UniQrcode from 'uniapp-qrcode'
+	// import UniQrcode from 'uniapp-qrcode'
 	import tools from '@/service/tools';
 	import EnBlank from "@/components/en-utils/en-blank/en-blank";
 	import {

yarn-error.log

@@ -1,34 +1,37 @@
 Arguments: 
-  D:\Program Files\nodejs\node.exe C:\Users\Administrator\AppData\Roaming\npm\node_modules\yarn\bin\yarn.js install
+  F:\node\node.exe C:\Users\Administrator\AppData\Roaming\npm\node_modules\yarn\bin\yarn.js install
 
 PATH: 
-  C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files\python;C:\Program Files\python\Scripts;D:\BtSoft\panel\script;D:\Program Files (x86)\NetSarang\Xftp 7\;D:\Program Files (x86)\NetSarang\Xshell 7\;D:\Program Files (x86)\Tencent\脦垄脨脜web驴陋路垄脮脽鹿陇戮脽\dll;C:\Pro;ramData\ComposerSetup\bin;d:\Program Files (x86)\Git\cmd;D:\texlive\20;D:\Program Files\nodejs\;C:\Users\Administrator\AppData\Local\Microsoft\WindowsApps;D:\BtSoft\php\74;D:\Program Files\nodejs;C:\Users\Administrator\AppData\Roaming\Composer\vendor\bin;D:\texlive\2023\bin\windows;C:\Users\Administrator\AppData\Roaming\npm
+  C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files\Git\cmd;F:\HBuilderX\plugins\launcher\tools\adbs;F:\node\;E:\微信web开发者工具\dll;C:\Users\Administrator\AppData\Local\Microsoft\WindowsApps;D:\Users\Administrator\AppData\Local\Programs\APICloud Studio 3\bin;C:\Users\Administrator\AppData\Roaming\npm
 
 Yarn version: 
   1.22.19
 
 Node version: 
-  16.20.2
+  16.17.0
 
 Platform: 
   win32 x64
 
 Trace: 
-  Error: connect ETIMEDOUT 104.16.28.34:443
-      at TCPConnectWrap.afterConnect [as oncomplete] (node:net:1278:16)
+  Error: connect ETIMEDOUT 104.16.31.34:443
+      at TCPConnectWrap.afterConnect [as oncomplete] (node:net:1247:16)
 
 npm manifest: 
   {
     "dependencies": {
-      "uni-read-pages": "^1.0.5",
-      "uni-simple-router": "^2.0.7",
-      "uploading-oss": "^1.0.3",
-      "jweixin-module": "^1.2.0"
+      "js-base64": "3.7.2",
+      "jweixin-module": "^1.6.0",
+      "uni-read-pages": "1.0.5",
+      "uni-simple-router": "2.0.7",
+      "uniapp-qrcode": "^1.0.2",
+      "uploading-oss": "1.0.3",
+      "wecomjsdk": "1.0.2"
     },
     "devDependencies": {
-      "@types/html5plus": "^1.0.2",
-      "@types/uni-app": "^1.4.4",
-      "vue-waterfall-easy": "^2.4.4"
+      "@types/html5plus": "1.0.2",
+      "@types/uni-app": "1.4.4",
+      "vue-waterfall-easy": "2.4.4"
     }
   }
 
@@ -41,102 +44,122 @@ Lockfile:
   
   
   "@babel/parser@^7.18.4":
-    version "7.21.4"
-    resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.4.tgz#94003fdfc520bbe2875d4ae557b43ddb6d880f17"
-    integrity sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw==
-  
-  "@types/html5plus@^1.0.2":
-    version "1.0.2"
-    resolved "https://registry.yarnpkg.com/@types/html5plus/-/html5plus-1.0.2.tgz#43e1aaca4584e7e2cf0db082389f42fbba98062c"
-    integrity sha512-OklP5lrmLq8/6TUOLgWc0LndUVvAiTWX5dnyoCFhIUtFW9opWsnCtG/UxPgeuC28Rv2XNbFfft/hEEI39P/4Ag==
-  
-  "@types/uni-app@^1.4.4":
-    version "1.4.4"
-    resolved "https://registry.yarnpkg.com/@types/uni-app/-/uni-app-1.4.4.tgz#fe73d0e7c89d5e750605e088ff6695846e019c36"
-    integrity sha512-ZTXnrCTblZyoLIoKbTv1Whz1nxrTcM7vg0qGXzDpXP8m9MqdjKt48N3FffQT1IsJWNkxbvJ1Eg5UHDaq+k+oBQ==
+    "integrity" "sha512-74bEXKX2h+8rrfQUfsBfuZZHzsEs6Eql4pqy/T4Nn6Y9wNPggQOqD6z6pn5Bl8ZfysKouFZT/UXEH94ummEeQw=="
+    "resolved" "https://registry.npmjs.org/@babel/parser/-/parser-7.19.0.tgz"
+    "version" "7.19.0"
+  
+  "@types/html5plus@1.0.2":
+    "integrity" "sha512-OklP5lrmLq8/6TUOLgWc0LndUVvAiTWX5dnyoCFhIUtFW9opWsnCtG/UxPgeuC28Rv2XNbFfft/hEEI39P/4Ag=="
+    "resolved" "https://registry.npmjs.org/@types/html5plus/-/html5plus-1.0.2.tgz"
+    "version" "1.0.2"
+  
+  "@types/uni-app@1.4.4":
+    "integrity" "sha512-ZTXnrCTblZyoLIoKbTv1Whz1nxrTcM7vg0qGXzDpXP8m9MqdjKt48N3FffQT1IsJWNkxbvJ1Eg5UHDaq+k+oBQ=="
+    "resolved" "https://registry.npmjs.org/@types/uni-app/-/uni-app-1.4.4.tgz"
+    "version" "1.4.4"
     dependencies:
-      vue "^2.6.8"
+      "vue" "^2.6.8"
   
-  "@vue/compiler-sfc@2.7.14":
-    version "2.7.14"
-    resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-2.7.14.tgz#3446fd2fbb670d709277fc3ffa88efc5e10284fd"
-    integrity sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA==
+  "@vue/compiler-sfc@2.7.10":
+    "integrity" "sha512-55Shns6WPxlYsz4WX7q9ZJBL77sKE1ZAYNYStLs6GbhIOMrNtjMvzcob6gu3cGlfpCR4bT7NXgyJ3tly2+Hx8Q=="
+    "resolved" "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.10.tgz"
+    "version" "2.7.10"
     dependencies:
       "@babel/parser" "^7.18.4"
-      postcss "^8.4.14"
-      source-map "^0.6.1"
-  
-  crypto-js@^4.1.1:
-    version "4.1.1"
-    resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.1.1.tgz#9e485bcf03521041bd85844786b83fb7619736cf"
-    integrity sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==
-  
-  csstype@^3.1.0:
-    version "3.1.2"
-    resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b"
-    integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==
-  
-  js-base64@^2.6.4:
-    version "2.6.4"
-    resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4"
-    integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==
-  
-  nanoid@^3.3.4:
-    version "3.3.6"
-    resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c"
-    integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
-  
-  picocolors@^1.0.0:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
-    integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
-  
-  postcss@^8.4.14:
-    version "8.4.21"
-    resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.21.tgz#c639b719a57efc3187b13a1d765675485f4134f4"
-    integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==
+      "postcss" "^8.4.14"
+      "source-map" "^0.6.1"
+  
+  "crypto-js@^4.1.1":
+    "integrity" "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="
+    "resolved" "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz"
+    "version" "4.1.1"
+  
+  "csstype@^3.1.0":
+    "integrity" "sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA=="
+    "resolved" "https://registry.npmjs.org/csstype/-/csstype-3.1.0.tgz"
+    "version" "3.1.0"
+  
+  "js-base64@^2.6.4":
+    "integrity" "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ=="
+    "resolved" "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz"
+    "version" "2.6.4"
+  
+  "js-base64@3.7.2":
+    "integrity" "sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ=="
+    "resolved" "https://registry.npmjs.org/js-base64/-/js-base64-3.7.2.tgz"
+    "version" "3.7.2"
+  
+  "jweixin-module@^1.6.0":
+    "integrity" "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w=="
+    "resolved" "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.6.0.tgz"
+    "version" "1.6.0"
+  
+  "nanoid@^3.3.4":
+    "integrity" "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="
+    "resolved" "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz"
+    "version" "3.3.4"
+  
+  "picocolors@^1.0.0":
+    "integrity" "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+    "resolved" "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"
+    "version" "1.0.0"
+  
+  "postcss@^8.4.14":
+    "integrity" "sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ=="
+    "resolved" "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz"
+    "version" "8.4.16"
     dependencies:
-      nanoid "^3.3.4"
-      picocolors "^1.0.0"
-      source-map-js "^1.0.2"
-  
-  source-map-js@^1.0.2:
-    version "1.0.2"
-    resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
-    integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
-  
-  source-map@^0.6.1:
-    version "0.6.1"
-    resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-    integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-  
-  uni-read-pages@^1.0.5:
-    version "1.0.5"
-    resolved "https://registry.npmmirror.com/uni-read-pages/-/uni-read-pages-1.0.5.tgz"
-    integrity sha512-GkrrZ0LX0vn9R5k6RKEi0Ez3Q3e2vUpjXQ8Z6/K/d28KudI9ajqgt8WEjQFlG5EPm1K6uTArN8LlqmZTEixDUA==
-  
-  uni-simple-router@^2.0.7:
-    version "2.0.7"
-    resolved "https://registry.npmmirror.com/uni-simple-router/-/uni-simple-router-2.0.7.tgz"
-    integrity sha512-8FKv5dw7Eoonm0gkO8udprrxzin0fNUI0+AvIphFkFRH5ZmP5ZWJ2pvnWzb2NiiqQSECTSU5VSB7HhvOSwD5eA==
-  
-  uploading-oss@^1.0.3:
-    version "1.0.3"
-    resolved "https://registry.yarnpkg.com/uploading-oss/-/uploading-oss-1.0.3.tgz#87aaca65a4d2028f099f19ef9e45d412acf6e5e4"
-    integrity sha512-aqHh5NCOBcrA4d8yCIKR7B9GrKzH88X7gL8BSvIw18pi79AgWnhDkCoyjQmDqzTvjQqYfKwyFTEgnafzMx/GbQ==
+      "nanoid" "^3.3.4"
+      "picocolors" "^1.0.0"
+      "source-map-js" "^1.0.2"
+  
+  "source-map-js@^1.0.2":
+    "integrity" "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
+    "resolved" "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz"
+    "version" "1.0.2"
+  
+  "source-map@^0.6.1":
+    "integrity" "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+    "resolved" "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
+    "version" "0.6.1"
+  
+  "uni-read-pages@1.0.5":
+    "integrity" "sha512-GkrrZ0LX0vn9R5k6RKEi0Ez3Q3e2vUpjXQ8Z6/K/d28KudI9ajqgt8WEjQFlG5EPm1K6uTArN8LlqmZTEixDUA=="
+    "resolved" "https://registry.npmmirror.com/uni-read-pages/-/uni-read-pages-1.0.5.tgz"
+    "version" "1.0.5"
+  
+  "uni-simple-router@2.0.7":
+    "integrity" "sha512-8FKv5dw7Eoonm0gkO8udprrxzin0fNUI0+AvIphFkFRH5ZmP5ZWJ2pvnWzb2NiiqQSECTSU5VSB7HhvOSwD5eA=="
+    "resolved" "https://registry.npmmirror.com/uni-simple-router/-/uni-simple-router-2.0.7.tgz"
+    "version" "2.0.7"
+  
+  "uniapp-qrcode@^1.0.2":
+    "integrity" "sha512-jcWwWz4yXsO7if/+78MMXj5VUdZTLu2D6L/IKb4mJkIw87oF11pO3WS/jS27SUcPCrX/BKcir5a2R1uvkaoR9g=="
+    "resolved" "https://registry.npmjs.org/uniapp-qrcode/-/uniapp-qrcode-1.0.2.tgz"
+    "version" "1.0.2"
+  
+  "uploading-oss@1.0.3":
+    "integrity" "sha512-aqHh5NCOBcrA4d8yCIKR7B9GrKzH88X7gL8BSvIw18pi79AgWnhDkCoyjQmDqzTvjQqYfKwyFTEgnafzMx/GbQ=="
+    "resolved" "https://registry.npmjs.org/uploading-oss/-/uploading-oss-1.0.3.tgz"
+    "version" "1.0.3"
     dependencies:
-      crypto-js "^4.1.1"
-      js-base64 "^2.6.4"
-  
-  vue-waterfall-easy@^2.4.4:
-    version "2.4.4"
-    resolved "https://registry.yarnpkg.com/vue-waterfall-easy/-/vue-waterfall-easy-2.4.4.tgz#a990ef3f7f7eb88dedc5ef40e064c4e68908e84c"
-    integrity sha512-5OkpT2FPNC3rHBy858zk/nmJxqdPaGmj/KVbmA6dgcvtsovKMa+zuf/Z7F+S2NnObeavpIBztTWgcH3S42ZD+g==
-  
-  vue@^2.6.8:
-    version "2.7.14"
-    resolved "https://registry.yarnpkg.com/vue/-/vue-2.7.14.tgz#3743dcd248fd3a34d421ae456b864a0246bafb17"
-    integrity sha512-b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ==
+      "crypto-js" "^4.1.1"
+      "js-base64" "^2.6.4"
+  
+  "vue-waterfall-easy@2.4.4":
+    "integrity" "sha512-5OkpT2FPNC3rHBy858zk/nmJxqdPaGmj/KVbmA6dgcvtsovKMa+zuf/Z7F+S2NnObeavpIBztTWgcH3S42ZD+g=="
+    "resolved" "https://registry.npmjs.org/vue-waterfall-easy/-/vue-waterfall-easy-2.4.4.tgz"
+    "version" "2.4.4"
+  
+  "vue@^2.6.8":
+    "integrity" "sha512-HmFC70qarSHPXcKtW8U8fgIkF6JGvjEmDiVInTkKZP0gIlEPhlVlcJJLkdGIDiNkIeA2zJPQTWJUI4iWe+AVfg=="
+    "resolved" "https://registry.npmjs.org/vue/-/vue-2.7.10.tgz"
+    "version" "2.7.10"
     dependencies:
-      "@vue/compiler-sfc" "2.7.14"
-      csstype "^3.1.0"
+      "@vue/compiler-sfc" "2.7.10"
+      "csstype" "^3.1.0"
+  
+  "wecomjsdk@1.0.2":
+    "integrity" "sha512-nPbrTcA5P8IOY/gQJJ3/AtXE2zSqJIQB156RUAQ2+RvwvJmcR66p7hpZtCjbtKefvyDO0LJBdEFqfjRR72zjIw=="
+    "resolved" "https://registry.npmmirror.com/wecomjsdk/-/wecomjsdk-1.0.2.tgz"
+    "version" "1.0.2"