From 387a894ca2da8742f146183dd0649315d72b15b2 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期一, 06 三月 2023 14:35:18 +0800
Subject: [PATCH] 修改进群提示文字颜色

---
 miniprogram/app.wxss                     |    2 
 miniprogram/app.ts                       |    2 
 .gitignore                               |    3 +
 package-lock.json                        |   42 ++++++++++++++
 tsconfig.json                            |    9 ++
 package.json                             |    6 +-
 miniprogram/app.json                     |    8 ++
 project.config.json                      |   10 ++
 miniprogram/pages/user/myself/index.wxml |    2 
 miniprogram/pages/user/report/index.wxss |   44 ++++++++++----
 miniprogram/pages/user/myself/index.wxss |    6 ++
 11 files changed, 109 insertions(+), 25 deletions(-)

diff --git a/.gitignore b/.gitignore
index 14ea590..bf0300e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,6 @@
 
 # Node.js
 node_modules/
+
+# IDEA
+.idea/
diff --git a/miniprogram/app.json b/miniprogram/app.json
index 8d17ee4..4c81b33 100644
--- a/miniprogram/app.json
+++ b/miniprogram/app.json
@@ -28,12 +28,18 @@
     "pages/user/group/message/index",
     "pages/user/group/message/publicty/index"
   ],
+  "usingComponents": {
+    "van-button": "@vant/weapp/button/index",
+    "van-empty": "@vant/weapp/empty/index",
+    "van-cell": "@vant/weapp/cell/index",
+     "van-cell-group": "@vant/weapp/cell-group/index"
+  },
   "window": {
     "backgroundTextStyle": "light",
     "navigationBarBackgroundColor": "#fff",
     "navigationBarTitleText": "闈掔緤鍒嗗眬缁忎睛澶ч槦",
     "navigationBarTextStyle": "black"
   },
-  "style": "v2",
+
   "sitemapLocation": "sitemap.json"
 }
\ No newline at end of file
diff --git a/miniprogram/app.ts b/miniprogram/app.ts
index 3ce50ff..5a08d9e 100644
--- a/miniprogram/app.ts
+++ b/miniprogram/app.ts
@@ -4,7 +4,7 @@
     //    url:'https://qyqgawx.cdqingyang.gov.cn/qyjz',
        url:'https://qyqjzdd.cdqingyang.gov.cn/qyjz',
     //    url:'http://221.237.182.28:8443/api',
-       imageUrl:'http://221.237.182.28:8443/minio'
+       imageUrl:'http://qyqjzdd.cdqingyang.gov.cn/minio'
 },
   onLaunch() {
     // 灞曠ず鏈湴瀛樺偍鑳藉姏
diff --git a/miniprogram/app.wxss b/miniprogram/app.wxss
index b5279bb..c762fbd 100644
--- a/miniprogram/app.wxss
+++ b/miniprogram/app.wxss
@@ -3,7 +3,7 @@
   height: 100%;
   display: flex;
   flex-direction: column;
-  align-items: center;
+  /* align-items: center; */
   justify-content: space-between;
   /* padding: 200rpx 0; */
   box-sizing: border-box;
diff --git a/miniprogram/pages/user/myself/index.wxml b/miniprogram/pages/user/myself/index.wxml
index aa6dbf5..8b9599d 100644
--- a/miniprogram/pages/user/myself/index.wxml
+++ b/miniprogram/pages/user/myself/index.wxml
@@ -14,5 +14,5 @@
        <view class="wenzi1">涓汉璧勬枡</view>
        </view>
     </view>
-    <view> <button class="button" bindtap="logout">閫� 鍑� 鐧� 褰�</button></view>
+    <view class="buttonView"> <button class="button" bindtap="logout">閫� 鍑� 鐧� 褰�</button></view>
 </view>
\ No newline at end of file
diff --git a/miniprogram/pages/user/myself/index.wxss b/miniprogram/pages/user/myself/index.wxss
index d42a65e..808e5cc 100644
--- a/miniprogram/pages/user/myself/index.wxss
+++ b/miniprogram/pages/user/myself/index.wxss
@@ -23,7 +23,13 @@
     margin-top: 1%;
     color: rgba(0, 0, 0, 0.5);
 }
+.buttonView{
+    position: absolute;
+    width: 100%;
+    bottom: 5%;
+}
 .button{
+    width: 90%;
     margin-top: 60%;
     font-size: 13px;
     color: #6699ff;
diff --git a/miniprogram/pages/user/report/index.wxss b/miniprogram/pages/user/report/index.wxss
index 664455d..1715b70 100644
--- a/miniprogram/pages/user/report/index.wxss
+++ b/miniprogram/pages/user/report/index.wxss
@@ -1,41 +1,57 @@
 /**index.wxss**/
-.font-wenzi{
+.icon {
+    height: 90%;
+}
+
+.font-wenzi {
     float: right;
     font-size: 30px;
     margin-right: 20px;
     margin-top: -15px;
-    color:rgba(0,0,0,0.2);
+    color: rgba(0, 0, 0, 0.2);
 }
-.font-name{
+
+.font-name {
     font-size: 14px;
     margin-bottom: 1%;
     margin-left: 2%;
 }
-.font-qita{
+
+.font-qita {
     font-size: 13px;
     margin-bottom: 2%;
     margin-left: 2%;
 }
 
-.conter{
-    border-bottom:1px solid rgba(0,0,0,0.1);
+.conter {
+    border-bottom: 1px solid rgba(0, 0, 0, 0.1);
 }
-.buttonView{
-    margin-top: 60%;
+
+.buttonView {
+    position: absolute;
+    width: 100%;
+    bottom: 5%;
 }
-.button{
+
+.button {
+    width: 90%;
     color: #ffffff;
     font-size: 13px;
     background-color: #6699ff;
 }
-.inGroup{
-float: right;
-font-size: 14px;
-margin-right: 50%;
+
+.inGroup {
+    float: right;
+    font-size: 14px;
+    margin-right: 50%;
+    color: #1890FF;
 }
-.noInGroup{
+
+.noInGroup {
     float: right;
     color: red;
     font-size: 14px;
     margin-right: 50%;
+    color: #D9001B;
+
 }
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..05013ad
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,42 @@
+{
+  "name": "miniprogram-ts-less-quickstart",
+  "version": "1.0.0",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "miniprogram-ts-less-quickstart",
+      "version": "1.0.0",
+      "dependencies": {
+        "@vant/weapp": "^1.10.14"
+      },
+      "devDependencies": {
+        "miniprogram-api-typings": "^2.8.3-1"
+      }
+    },
+    "node_modules/@vant/weapp": {
+      "version": "1.10.14",
+      "resolved": "https://registry.npmjs.org/@vant/weapp/-/weapp-1.10.14.tgz",
+      "integrity": "sha512-5usuhoN1kiOV6pzrdVzHrAux6DupKlGd9w+yYc992Zy1n1wHLZMb1dGM3+xtbNE3tpWE2qv95vIFSMpJRFyE7Q=="
+    },
+    "node_modules/miniprogram-api-typings": {
+      "version": "2.12.0",
+      "resolved": "https://registry.npmmirror.com/miniprogram-api-typings/-/miniprogram-api-typings-2.12.0.tgz",
+      "integrity": "sha512-ibvbqeslVFur0IAvTxLMvsbtvVcMo6gwvOnj0YZHV7aeDLu091VQRrETT2QuiG9P6aZWRcxeNGJChRKVPCp9VQ==",
+      "dev": true
+    }
+  },
+  "dependencies": {
+    "@vant/weapp": {
+      "version": "1.10.14",
+      "resolved": "https://registry.npmjs.org/@vant/weapp/-/weapp-1.10.14.tgz",
+      "integrity": "sha512-5usuhoN1kiOV6pzrdVzHrAux6DupKlGd9w+yYc992Zy1n1wHLZMb1dGM3+xtbNE3tpWE2qv95vIFSMpJRFyE7Q=="
+    },
+    "miniprogram-api-typings": {
+      "version": "2.12.0",
+      "resolved": "https://registry.npmmirror.com/miniprogram-api-typings/-/miniprogram-api-typings-2.12.0.tgz",
+      "integrity": "sha512-ibvbqeslVFur0IAvTxLMvsbtvVcMo6gwvOnj0YZHV7aeDLu091VQRrETT2QuiG9P6aZWRcxeNGJChRKVPCp9VQ==",
+      "dev": true
+    }
+  }
+}
diff --git a/package.json b/package.json
index 623f16f..ffd80fc 100644
--- a/package.json
+++ b/package.json
@@ -2,12 +2,12 @@
   "name": "miniprogram-ts-less-quickstart",
   "version": "1.0.0",
   "description": "",
-  "scripts": {
-  },
-  "keywords": [], 
+  "scripts": {},
+  "keywords": [],
   "author": "",
   "license": "",
   "dependencies": {
+    "@vant/weapp": "^1.10.14"
   },
   "devDependencies": {
     "miniprogram-api-typings": "^2.8.3-1"
diff --git a/project.config.json b/project.config.json
index fe8eb93..128ccc2 100644
--- a/project.config.json
+++ b/project.config.json
@@ -16,9 +16,15 @@
         "minified": false,
         "enhance": true,
         "showShadowRootInWxmlPanel": false,
-        "packNpmRelationList": [],
+        "packNpmRelationList": [
+            {
+                "packageJsonPath": "./package.json",
+                "miniprogramNpmDistDir": "./miniprogram/"
+            }
+        ],
         "ignoreUploadUnusedFiles": true,
-        "es6": true
+        "es6": true,
+        "packNpmManually": true
     },
     "simulatorType": "wechat",
     "simulatorPluginLibVersion": {},
diff --git a/tsconfig.json b/tsconfig.json
index ade784e..5709d20 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -16,10 +16,15 @@
     "noUnusedParameters": true,
     "strict": true,
     "strictPropertyInitialization": true,
-    "lib": ["ES2020"],
     "typeRoots": [
       "./typings"
-    ]
+    ],
+    "baseUrl": ".",
+    "types": ["miniprogram-api-typings"],
+    "paths": {
+      "@vant/weapp/*": ["path/to/node_modules/@vant/weapp/dist/*"]
+    },
+    "lib": ["ES6"]
   },
   "include": [
     "./**/*.ts"

--
Gitblit v1.8.0