xiaohaizhao 7 months ago
parent
commit
13d4f90ef5

+ 3 - 0
components/My-shade/My-shade.vue

@@ -24,6 +24,9 @@ const { $Http } = getCurrentInstance().proxy;
 let show = ref(false);
 onShow(() => {
     show.value = !$Http.isLoad;
+    setTimeout(() => {
+        show.value = false;
+    }, 1000);
 });
 
 function handleClick() {

+ 49 - 45
manifest.json

@@ -1,28 +1,28 @@
 {
-    "name": "美大服务工人小程序",
-    "appid": "__UNI__0BCE2F5",
-    "description": "",
-    "versionName": "1.0.0",
-    "versionCode": "100",
-    "transformPx": false,
+    "name" : "美大服务工人小程序",
+    "appid" : "__UNI__0BCE2F5",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
     /* 5+App特有相关 */
-    "app-plus": {
-        "usingComponents": true,
-        "nvueStyleCompiler": "uni-app",
-        "compilerVersion": 3,
-        "splashscreen": {
-            "alwaysShowBeforeRender": true,
-            "waiting": true,
-            "autoclose": true,
-            "delay": 0
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
         },
         /* 模块配置 */
-        "modules": {},
+        "modules" : {},
         /* 应用发布信息 */
-        "distribute": {
+        "distribute" : {
             /* android打包配置 */
-            "android": {
-                "permissions": [
+            "android" : {
+                "permissions" : [
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
@@ -41,42 +41,46 @@
                 ]
             },
             /* ios打包配置 */
-            "ios": {},
+            "ios" : {},
             /* SDK配置 */
-            "sdkConfigs": {}
+            "sdkConfigs" : {}
         }
     },
     /* 快应用特有相关 */
-    "quickapp": {},
+    "quickapp" : {},
     /* 小程序特有相关 */
-    "mp-weixin": {
-        "appid": "wxe89d8c8225f75d79",
-        "mergeVirtualHostAttributes": true,
-        "setting": {
-            "urlCheck": false,
-            "minified": true
+    "mp-weixin" : {
+        "appid" : "wxe89d8c8225f75d79",
+        "mergeVirtualHostAttributes" : true,
+        "setting" : {
+            "urlCheck" : false,
+            "minified" : true
         },
-        "usingComponents": true,
-        "permission": {}
+        "usingComponents" : true,
+        "permission" : {}
     },
-    "mp-alipay": {
-        "usingComponents": true
+    "mp-alipay" : {
+        "usingComponents" : true
     },
-    "mp-baidu": {
-        "usingComponents": true
+    "mp-baidu" : {
+        "usingComponents" : true
     },
-    "mp-toutiao": {
-        "usingComponents": true,
-        "mergeVirtualHostAttributes": true
+    "mp-toutiao" : {
+        "usingComponents" : true,
+        "mergeVirtualHostAttributes" : true
     },
-    "uniStatistics": {
-        "enable": false
+    "uniStatistics" : {
+        "enable" : false
     },
-    "vueVersion": "3",
-    "h5": {
-        "router": {
-            "mode": "history"
+    "vueVersion" : "3",
+    "h5" : {
+        "router" : {
+            "mode" : "hash",
+            "base" : "./"
         },
-        "title": "美大服务"
+        "title" : "美大服务",
+        "devServer" : {
+            "https" : false
+        }
     }
-}
+}

+ 7 - 1
pages/bookingService/index.vue

@@ -227,7 +227,7 @@ function save() {
 
                 form.customername = userRecord.name || form.scenecontact;
                 form.customerphonenumber = userRecord.phonenumber || form.scenecontactphonenumber;
-                form.name = userRecord.phonenumber || form.scenecontactphonenumber;
+                form.name = form.customername;
                 form.phonenumber = userRecord.phonenumber || form.scenecontactphonenumber;
                 let content = {
                     ...form
@@ -274,6 +274,11 @@ function skuConfirm() {
         ['contact', 'serviceenterprisename', 'cardno', 'itemid', 'itemname', 'itemno', 'model', 'phonenumber', 'unitname', 'spec'].forEach(key => {
             form[key] = '';
         });
+        if (form.sku == '') return;
+        uni.showLoading({
+            title: '查询中...',
+            mask: true,
+        });
         $Http.basic({
             "id": 2025080813465203,
             "content": {
@@ -285,6 +290,7 @@ function skuConfirm() {
             }
         }).then(res => {
             console.log(res)
+            uni.hideLoading();
             if (res.code !== 1) return uni.showToast({ title: res.msg, icon: 'none' });
             if (res.data.length === 0 || res.data[0].sku !== form.sku) {
                 uni.showToast({ title: '未找到对应的产品信息', icon: 'none' });

+ 2 - 2
pages/login/login.vue

@@ -130,8 +130,8 @@ function getAuthCode() {
                     "content": {
                         "name": "用户" + phonenumber.value.slice(-4),
                         "phonenumber": phonenumber.value,
-                        accountprefix: 'CCYOSG',// 测试用的楚楚站点 正式要改为美大
-                        siteid: 'CCYOSG',
+                        accountprefix: 'MD',// 测试用的楚楚站点 正式要改为美大
+                        siteid: 'MD',
                     }
                 }).then(res => {
                     console.log("注册结果:", res);

+ 4 - 3
static/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4985326 */
-  src: url('//at.alicdn.com/t/c/font_4985326_k6gds60jjxi.woff2?t=1756186335629') format('woff2'),
-       url('//at.alicdn.com/t/c/font_4985326_k6gds60jjxi.woff?t=1756186335629') format('woff'),
-       url('//at.alicdn.com/t/c/font_4985326_k6gds60jjxi.ttf?t=1756186335629') format('truetype');
+  src: url('iconfont.woff2?t=1756430846048') format('woff2'),
+       url('iconfont.woff?t=1756430846048') format('woff'),
+       url('iconfont.ttf?t=1756430846048') format('truetype');
 }
 
 .iconfont {
@@ -84,3 +84,4 @@
 .icon-wode-weixuanzhong:before {
   content: "\e6f9";
 }
+

BIN
static/iconfont.ttf


BIN
static/iconfont.woff


BIN
static/iconfont.woff2