Browse Source

正式版

xiaoxin 3 years ago
parent
commit
f7366c428f

+ 59 - 65
pages/authorization/authorization.vue

@@ -1,91 +1,85 @@
 <template>
 <template>
 	<view class="content">
 	<view class="content">
-		<view class="logo">
-			<img class="img" src="../../static/logo.png">
-		</view>
+		<view class="logo"><img class="img" src="../../static/logo.png" /></view>
 
 
 		<button class="button" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
 		<button class="button" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
-			<img class="img" src="../../static/weixin.svg">
+			<img class="img" src="../../static/weixin.svg" />
 			<span>微信一键授权</span>
 			<span>微信一键授权</span>
 		</button>
 		</button>
 	</view>
 	</view>
 </template>
 </template>
 
 
 <script setup>
 <script setup>
-	import {
-		ref
-	} from 'vue'
-	import {
-		myRequest
-	} from '../../util/api.js'
+import { ref } from 'vue'
+import { myRequest } from '../../util/api.js'
 
 
-	const code = ref('')
+const code = ref('')
 
 
-	const getPhoneNumber = async (e) => {
-		code.value = e.detail.code
-		if (code.value) {
-			const res = await myRequest({
-				url: "/wx/getPhone",
-				data: {
-					code: code.value
-				}
-			})
-			// console.log(res);
-			if (res.success && res.code == 1) {
-				uni.setStorageSync('wxPhone', res.data)
-				uni.setStorageSync('accredit', true)
-				uni.redirectTo({
-					url:"/pages/index/index"
-				})
-			} else {
-				uni.showToast({
-					title: res.message,
-					icon:'none'
-				})
+const getPhoneNumber = async e => {
+	code.value = e.detail.code
+	if (code.value) {
+		const res = await myRequest({
+			url: '/wx/getPhone',
+			data: {
+				code: code.value
 			}
 			}
+		})
+		// console.log(res);
+		if (res.success && res.code == 1) {
+			uni.setStorageSync('wxPhone', res.data)
+			uni.setStorageSync('accredit', true)
+			uni.reLaunch({
+				url: '/pages/index/index'
+			})
+		} else {
+			uni.showToast({
+				title: res.message,
+				icon: 'none'
+			})
 		}
 		}
 	}
 	}
+}
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
-	.content {
-		width: 100vw;
-		height: 100vh;
-		overflow: hidden;
-		background-color: #fff;
+.content {
+	width: 100vw;
+	height: 100vh;
+	overflow: hidden;
+	background-color: #fff;
 
 
-		.logo {
-			margin: 300rpx auto 0;
-			width: 150rpx;
-			height: 150rpx;
-			border-radius: 20rpx;
-			box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.12);
+	.logo {
+		margin: 300rpx auto 0;
+		width: 150rpx;
+		height: 150rpx;
+		border-radius: 20rpx;
+		box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.12);
 
 
-			.img {
-				width: 100%;
-				height: 100%;
-				border-radius: 20rpx;
-			}
+		.img {
+			width: 100%;
+			height: 100%;
+			border-radius: 20rpx;
 		}
 		}
+	}
 
 
-		.button {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			margin: 150rpx auto 0;
-			width: 600rpx;
-			height: 100rpx;
-			font-size: 32rpx;
-			color: #fff;
-			border-radius: 50rpx;
-			background-color: #1E7DFB;
+	.button {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		margin: 150rpx auto 0;
+		width: 600rpx;
+		height: 100rpx;
+		font-size: 32rpx;
+		color: #fff;
+		border-radius: 50rpx;
+		background-color: #1e7dfb;
 
 
-			.img {
-				margin-right: 20rpx;
-				width: 50rpx;
-				height: 50rpx;
-				color: #fff;
-			}
+		.img {
+			margin-right: 20rpx;
+			width: 50rpx;
+			height: 50rpx;
+			color: #fff;
 		}
 		}
 	}
 	}
+}
 </style>
 </style>

File diff suppressed because it is too large
+ 460 - 459
pages/index/index.vue


+ 15 - 6
unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -504,7 +504,11 @@ function normalizeLocale(locale, messages) {
     }
     }
     return LOCALE_ZH_HANS;
     return LOCALE_ZH_HANS;
   }
   }
-  const lang = startsWith(locale, [LOCALE_EN, LOCALE_FR, LOCALE_ES]);
+  let locales = [LOCALE_EN, LOCALE_FR, LOCALE_ES];
+  if (messages && Object.keys(messages).length > 0) {
+    locales = Object.keys(messages);
+  }
+  const lang = startsWith(locale, locales);
   if (lang) {
   if (lang) {
     return lang;
     return lang;
   }
   }
@@ -1502,8 +1506,8 @@ function populateParameters(fromRes, toRes) {
     appVersion: "1.0.0",
     appVersion: "1.0.0",
     appVersionCode: "100",
     appVersionCode: "100",
     appLanguage: getAppLanguage(hostLanguage),
     appLanguage: getAppLanguage(hostLanguage),
-    uniCompileVersion: "3.7.11",
-    uniRuntimeVersion: "3.7.11",
+    uniCompileVersion: "3.8.4",
+    uniRuntimeVersion: "3.8.4",
     uniPlatform: "mp-weixin",
     uniPlatform: "mp-weixin",
     deviceBrand,
     deviceBrand,
     deviceModel: model,
     deviceModel: model,
@@ -1745,10 +1749,14 @@ function isWxKey(key) {
   return objectKeys.indexOf(key) > -1 || typeof wx[key] === "function";
   return objectKeys.indexOf(key) > -1 || typeof wx[key] === "function";
 }
 }
 function initWx() {
 function initWx() {
+  let global2 = wx;
+  if (typeof globalThis !== "undefined" && globalThis.wx && wx !== globalThis.wx) {
+    global2 = globalThis.wx;
+  }
   const newWx = {};
   const newWx = {};
-  for (const key in wx) {
+  for (const key in global2) {
     if (isWxKey(key)) {
     if (isWxKey(key)) {
-      newWx[key] = wx[key];
+      newWx[key] = global2[key];
     }
     }
   }
   }
   if (typeof globalThis !== "undefined") {
   if (typeof globalThis !== "undefined") {
@@ -6124,7 +6132,7 @@ function createInvoker(initialValue, instance) {
     const eventValue = invoker.value;
     const eventValue = invoker.value;
     const invoke = () => callWithAsyncErrorHandling(patchStopImmediatePropagation(e2, eventValue), instance, 5, args);
     const invoke = () => callWithAsyncErrorHandling(patchStopImmediatePropagation(e2, eventValue), instance, 5, args);
     const eventTarget = e2.target;
     const eventTarget = e2.target;
-    const eventSync = eventTarget ? eventTarget.dataset ? eventTarget.dataset.eventsync === "true" : false : false;
+    const eventSync = eventTarget ? eventTarget.dataset ? String(eventTarget.dataset.eventsync) === "true" : false : false;
     if (bubbles.includes(e2.type) && !eventSync) {
     if (bubbles.includes(e2.type) && !eventSync) {
       setTimeout(invoke);
       setTimeout(invoke);
     } else {
     } else {
@@ -6833,6 +6841,7 @@ function parseComponent(vueOptions, { parse: parse2, mocks: mocks2, isPage: isPa
   vueOptions = vueOptions.default || vueOptions;
   vueOptions = vueOptions.default || vueOptions;
   const options = {
   const options = {
     multipleSlots: true,
     multipleSlots: true,
+    // styleIsolation: 'apply-shared',
     addGlobalClass: true,
     addGlobalClass: true,
     pureDataPattern: /^uP$/
     pureDataPattern: /^uP$/
   };
   };

+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/authorization/authorization.js

@@ -17,7 +17,7 @@ const _sfc_main = {
         if (res.success && res.code == 1) {
         if (res.success && res.code == 1) {
           common_vendor.index.setStorageSync("wxPhone", res.data);
           common_vendor.index.setStorageSync("wxPhone", res.data);
           common_vendor.index.setStorageSync("accredit", true);
           common_vendor.index.setStorageSync("accredit", true);
-          common_vendor.index.redirectTo({
+          common_vendor.index.reLaunch({
             url: "/pages/index/index"
             url: "/pages/index/index"
           });
           });
         } else {
         } else {

+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/authorization/authorization.wxml

@@ -1 +1 @@
-<view class="content data-v-2e3c7ef5"><view class="logo data-v-2e3c7ef5"><image class="img data-v-2e3c7ef5" src="/static/logo.png"></image></view><button class="button data-v-2e3c7ef5" open-type="getPhoneNumber" bindgetphonenumber="{{a}}"><image class="img data-v-2e3c7ef5" src="/static/weixin.svg"></image><label class="data-v-2e3c7ef5">微信一键授权</label></button></view>
+<view class="content data-v-2e3c7ef5"><view class="logo data-v-2e3c7ef5"><image class="img data-v-2e3c7ef5" src="/static/logo.png"/></view><button class="button data-v-2e3c7ef5" open-type="getPhoneNumber" bindgetphonenumber="{{a}}"><image class="img data-v-2e3c7ef5" src="/static/weixin.svg"/><label class="data-v-2e3c7ef5">微信一键授权</label></button></view>

+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/authorization/authorization.wxss

@@ -28,7 +28,7 @@
   font-size: 32rpx;
   font-size: 32rpx;
   color: #fff;
   color: #fff;
   border-radius: 50rpx;
   border-radius: 50rpx;
-  background-color: #1E7DFB;
+  background-color: #1e7dfb;
 }
 }
 .content .button .img.data-v-2e3c7ef5 {
 .content .button .img.data-v-2e3c7ef5 {
   margin-right: 20rpx;
   margin-right: 20rpx;

+ 50 - 47
unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -39,63 +39,66 @@ const _sfc_main = {
     const projectImgList = common_vendor.ref(common_vendor.index.getStorageSync("form_content") ? JSON.parse(common_vendor.index.getStorageSync("form_content")).projectImgList : []);
     const projectImgList = common_vendor.ref(common_vendor.index.getStorageSync("form_content") ? JSON.parse(common_vendor.index.getStorageSync("form_content")).projectImgList : []);
     const subImgList = common_vendor.ref(common_vendor.index.getStorageSync("form_content") ? JSON.parse(common_vendor.index.getStorageSync("form_content")).subImgList : []);
     const subImgList = common_vendor.ref(common_vendor.index.getStorageSync("form_content") ? JSON.parse(common_vendor.index.getStorageSync("form_content")).subImgList : []);
     const wxPhone = common_vendor.ref(common_vendor.index.getStorageSync("wxPhone") || "");
     const wxPhone = common_vendor.ref(common_vendor.index.getStorageSync("wxPhone") || "");
-    const range = common_vendor.ref(
-      [
-        {
-          value: 0,
-          text: "政府"
-        },
-        {
-          value: 1,
-          text: "教育"
-        },
-        {
-          value: 2,
-          text: "医疗"
-        },
-        {
-          value: 3,
-          text: "企业"
-        },
-        {
-          value: 4,
-          text: "公检法"
-        },
-        {
-          value: 5,
-          text: "交通"
-        },
-        {
-          value: 6,
-          text: "分销&SMB"
-        },
-        {
-          value: 7,
-          text: "其他"
-        }
-      ]
-    );
-    const hobby = common_vendor.ref(
-      [{
+    const range = common_vendor.ref([
+      {
+        value: 0,
+        text: "政府"
+      },
+      {
+        value: 1,
+        text: "教育"
+      },
+      {
+        value: 2,
+        text: "医疗"
+      },
+      {
+        value: 3,
+        text: "企业"
+      },
+      {
+        value: 4,
+        text: "公检法"
+      },
+      {
+        value: 5,
+        text: "交通"
+      },
+      {
+        value: 6,
+        text: "分销&SMB"
+      },
+      {
+        value: 7,
+        text: "其他"
+      }
+    ]);
+    const hobby = common_vendor.ref([
+      {
         text: "网络",
         text: "网络",
         value: 0
         value: 0
-      }, {
+      },
+      {
         text: "安全",
         text: "安全",
         value: 1
         value: 1
-      }, {
+      },
+      {
         text: "IT",
         text: "IT",
         value: 2
         value: 2
-      }, {
+      },
+      {
         text: "云智",
         text: "云智",
         value: 3
         value: 3
-      }, {
+      },
+      {
         text: "PC",
         text: "PC",
         value: 4
         value: 4
-      }, {
+      },
+      {
         text: "AI视觉",
         text: "AI视觉",
         value: 5
         value: 5
-      }]
-    );
+      }
+    ]);
     const imageStyles = {
     const imageStyles = {
       width: 75,
       width: 75,
       height: 75,
       height: 75,
@@ -294,7 +297,7 @@ const _sfc_main = {
       }
       }
     };
     };
     const getCurrentDate = () => {
     const getCurrentDate = () => {
-      const date = new Date();
+      const date = /* @__PURE__ */ new Date();
       let year = date.getFullYear();
       let year = date.getFullYear();
       let month = date.getMonth() + 1;
       let month = date.getMonth() + 1;
       let day = date.getDate();
       let day = date.getDate();
@@ -313,7 +316,7 @@ const _sfc_main = {
             title: "上传中"
             title: "上传中"
           });
           });
           common_vendor.index.uploadFile({
           common_vendor.index.uploadFile({
-            url: `https://chtech.ncjti.edu.cn/gradiate-school/reporting/file/fileUpDown`,
+            url: `https://jiangxih3cpartner.com/reporting/file/fileUpDown`,
             filePath: resPath,
             filePath: resPath,
             name: "file",
             name: "file",
             success: (uploadFileRes) => {
             success: (uploadFileRes) => {

File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/index/index.wxml


+ 6 - 6
unpackage/dist/dev/mp-weixin/pages/index/index.wxss

@@ -7,7 +7,7 @@
   width: 750rpx;
   width: 750rpx;
   height: 300rpx;
   height: 300rpx;
   border-radius: 0 0 10% 10%;
   border-radius: 0 0 10% 10%;
-  background-color: #1E7DFB;
+  background-color: #1e7dfb;
 }
 }
 .content .form.data-v-1cf27b2a {
 .content .form.data-v-1cf27b2a {
   position: absolute;
   position: absolute;
@@ -28,23 +28,23 @@
   font-size: 28rpx;
   font-size: 28rpx;
 }
 }
 .content .form .form_item .icon.data-v-1cf27b2a {
 .content .form .form_item .icon.data-v-1cf27b2a {
-  color: #D43030;
+  color: #d43030;
 }
 }
 .content .form .form_item.data-v-1cf27b2a .uni-easyinput {
 .content .form .form_item.data-v-1cf27b2a .uni-easyinput {
   margin-top: 10rpx;
   margin-top: 10rpx;
-  background-color: #F2F2F2;
+  background-color: #f2f2f2;
 }
 }
 .content .form .form_item.data-v-1cf27b2a .uni-stat__select {
 .content .form .form_item.data-v-1cf27b2a .uni-stat__select {
   margin-top: 10rpx;
   margin-top: 10rpx;
-  background-color: #F2F2F2;
+  background-color: #f2f2f2;
 }
 }
 .content .form .form_item.data-v-1cf27b2a .uni-data-checklist {
 .content .form .form_item.data-v-1cf27b2a .uni-data-checklist {
   margin-top: 10rpx !important;
   margin-top: 10rpx !important;
-  background-color: #F2F2F2;
+  background-color: #f2f2f2;
 }
 }
 .content .form .form_button.data-v-1cf27b2a {
 .content .form .form_button.data-v-1cf27b2a {
   margin-top: 65rpx;
   margin-top: 65rpx;
-  background-color: #1E7DFB;
+  background-color: #1e7dfb;
   color: #fff;
   color: #fff;
   font-size: 28rpx;
   font-size: 28rpx;
 }
 }

+ 3 - 2
unpackage/dist/dev/mp-weixin/project.config.json

@@ -11,12 +11,13 @@
     "minified": false,
     "minified": false,
     "newFeature": true,
     "newFeature": true,
     "bigPackageSizeSupport": true,
     "bigPackageSizeSupport": true,
+    "packNpmRelationList": [],
+    "condition": false,
     "babelSetting": {
     "babelSetting": {
       "ignore": [],
       "ignore": [],
       "disablePlugins": [],
       "disablePlugins": [],
       "outputPath": ""
       "outputPath": ""
-    },
-    "condition": false
+    }
   },
   },
   "compileType": "miniprogram",
   "compileType": "miniprogram",
   "libVersion": "2.32.0",
   "libVersion": "2.32.0",

+ 1 - 1
unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -1,6 +1,6 @@
 {
 {
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "projectname": "agent-registration",
+  "projectname": "mp-weixin",
   "setting": {
   "setting": {
     "compileHotReLoad": true
     "compileHotReLoad": true
   },
   },

+ 1 - 1
unpackage/dist/dev/mp-weixin/util/api.js

@@ -1,6 +1,6 @@
 "use strict";
 "use strict";
 const common_vendor = require("../common/vendor.js");
 const common_vendor = require("../common/vendor.js");
-const BASE_URL = "https://chtech.ncjti.edu.cn/gradiate-school/reporting";
+const BASE_URL = "https://jiangxih3cpartner.com/reporting";
 const myRequest = (options) => {
 const myRequest = (options) => {
   common_vendor.index.showLoading({
   common_vendor.index.showLoading({
     title: "加载中",
     title: "加载中",

+ 3 - 6
util/api.js

@@ -1,8 +1,5 @@
-// 线上地址
-// const BASE_URL = "https://chtech.ncjti.edu.cn/campusclock"
-// 本地地址
-const BASE_URL = "https://chtech.ncjti.edu.cn/gradiate-school/reporting"
-// const BASE_URL = "http://192.168.161.34:8888/reporting"
+// const BASE_URL = "https://chtech.ncjti.edu.cn/gradiate-school/reporting"
+const BASE_URL = "https://jiangxih3cpartner.com/reporting"
 export const myRequest = (options) => {
 export const myRequest = (options) => {
 	uni.showLoading({
 	uni.showLoading({
 		title: "加载中",
 		title: "加载中",
@@ -28,4 +25,4 @@ export const myRequest = (options) => {
 			}
 			}
 		})
 		})
 	})
 	})
-}
+}