Merge branch 'dev' of https://gitea.dykj.co/sundongyu/dykj-football into dev

manifest.json

@@ -1,72 +1,78 @@
 {
-    "name" : "足球人",
+  "name": "足球人",
-    "appid" : "__UNI__9C758F7",
+  "appid": "__UNI__9C758F7",
-    "description" : "",
+  "description": "",
-    "versionName" : "1.0.0",
+  "versionName": "1.0.0",
-    "versionCode" : "100",
+  "versionCode": "100",
-    "transformPx" : false,
+  "transformPx": false,
-    /* 5+App特有相关 */
+  /* 5+App特有相关 */
-    "app-plus" : {
+  "app-plus": {
-        "usingComponents" : true,
+    "usingComponents": true,
-        "nvueStyleCompiler" : "uni-app",
+    "nvueStyleCompiler": "uni-app",
-        "compilerVersion" : 3,
+    "compilerVersion": 3,
-        "splashscreen" : {
+    "splashscreen": {
-            "alwaysShowBeforeRender" : true,
+      "alwaysShowBeforeRender": true,
-            "waiting" : true,
+      "waiting": true,
-            "autoclose" : true,
+      "autoclose": true,
-            "delay" : 0
+      "delay": 0
-        },
-        /* 模块配置 */
-        "modules" : {},
-        /* 应用发布信息 */
-        "distribute" : {
-            /* android打包配置 */
-            "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\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
-            },
-            /* ios打包配置 */
-            "ios" : {},
-            /* SDK配置 */
-            "sdkConfigs" : {}
-        }
     },
-    /* 快应用特有相关 */
+    /* 模块配置 */
-    "quickapp" : {},
+    "modules": {},
-    /* 小程序特有相关 */
+    /* 应用发布信息 */
-    "mp-weixin" : {
+    "distribute": {
-        "appid" : "",
+      /* android打包配置 */
-        "setting" : {
+      "android": {
-            "urlCheck" : false
+        "permissions": [
-        },
+          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-        "usingComponents" : true
+          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+          "<uses-feature android:name=\"android.hardware.camera\"/>",
+          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+        ]
+      },
+      /* ios打包配置 */
+      "ios": {},
+      /* SDK配置 */
+      "sdkConfigs": {}
+    }
+  },
+  /* 快应用特有相关 */
+  "quickapp": {},
+  /* 小程序特有相关 */
+  "mp-weixin": {
+    "appid": "",
+    "setting": {
+      "urlCheck": false
     },
-    "mp-alipay" : {
+    "usingComponents": true
-        "usingComponents" : true
+  },
-    },
+  "mp-alipay": {
-    "mp-baidu" : {
+    "usingComponents": true
-        "usingComponents" : true
+  },
-    },
+  "mp-baidu": {
-    "mp-toutiao" : {
+    "usingComponents": true
-        "usingComponents" : true
+  },
-    },
+  "mp-toutiao": {
-    "uniStatistics" : {
+    "usingComponents": true
-        "enable" : false
+  },
-    },
+  "uniStatistics": {
-    "vueVersion" : "3"
+    "enable": false
+  },
+  "vueVersion": "3",
+  "h5": {
+    "router": {
+      "mode": "history",
+      "base": "./"
+    }
+  }
 }

pages/index/compontents/scheme.vue

@@ -35,7 +35,7 @@
         </view>
         <view class="centre">本月得分:{{ score }}</view>
         <view class="centre-box">20年程序员工作经验</view>
-        <view class="below">擅长联赛：法国各级联赛</view>
+        <view class="up-below">擅长联赛：法国各级联赛</view>
       </view>
       <view class="record-centre">
         <view class="up">高手简介</view>
@@ -168,15 +168,16 @@
   .page-navbar {
     display: flex;
     .nav {
-      margin-left: 32.5%;
+      margin-left: 34.6%;
     }
   }
   .record {
-    margin: 20rpx auto 0;
+    margin: 40rpx auto 0;
     height: 1000rpx;
     width: 90%;
     border: 1rpx solid #000;
     background-color: #fff;
+    border-radius: 20rpx;
     .record-up {
       height: 35%;
       width: 90%;
@@ -201,6 +202,9 @@
           align-items: baseline;
         }
       }
+      .up-below {
+        margin-top: 20rpx;
+      }
       .centre {
         padding: 12rpx 5rpx 10rpx;
         margin-top: 20rpx;
@@ -240,6 +244,7 @@
       .centre ::v-deep .u-tag {
         margin: 20rpx;
         height: 80rpx;
+        border-radius: 15rpx;
       }
       .below {
         margin-top: 200rpx;

pages/index/index.vue

@@ -17,13 +17,11 @@
         <view class="card" v-for="item in text">{{ item.txt }}</view>
       </view>
       <view class="Off-card">
-        <view class="Long-card" v-for="item in 2">1</view>
+        <view class="Long-card" v-for="item in text1">{{ item.txt }}</view>
       </view>
       <view class="scheme">
         <view style="font-weight: 700">今日方案</view>
-        <view
+        <view style="display: flex; justify-content: space-around">
-          style="display: flex; width: 150rpx; justify-content: space-around"
-        >
           <view style="font-size: 20rpx">查看更多</view>
           <u-icon name="arrow-right" size="12" color="#555555"></u-icon>
         </view>
@@ -160,6 +158,14 @@
       txt: '高玩区',
     },
   ])
+  const text1 = ref([
+    {
+      txt: '充值',
+    },
+    {
+      txt: '个人中心',
+    },
+  ])
   const src = ref({
     src: 'http://pic2.sc.chinaz.com/Files/pic/pic9/202002/hpic2119_s.jpg',
     text: '无头像',
@@ -219,7 +225,7 @@
     text-align: center;
   }
   .headPortrait {
-    width: 650rpx;
+    width: 85%;
     height: 250rpx;
     border-radius: 20rpx;
     margin: auto;
@@ -228,8 +234,10 @@
     border: 1rpx solid #b6b5b3;
   }
   .Off-card {
+    width: 85%;
+    margin: 0 auto;
     display: flex;
-    justify-content: space-evenly;
+    justify-content: space-between;
     margin-top: 15rpx;
   }
   .card {
@@ -249,15 +257,20 @@
     margin-top: 15rpx;
     border-radius: 15rpx;
     border: 1rpx solid #b6b5b3;
+    display: flex;
+    justify-content: center;
+    align-items: center;
   }
   .scheme {
+    width: 85%;
+    margin: auto;
     display: flex;
     justify-content: space-between;
-    margin: 35rpx;
     line-height: 40rpx;
+    margin-top: 15rpx;
   }
   .Pitch-card {
-    width: 650rpx;
+    width: 85%;
     height: 400rpx;
     border-radius: 15rpx;
     margin: 20rpx auto;
@@ -283,7 +296,7 @@
     }
   }
   .Master-card {
-    width: 650rpx;
+    width: 85%;
     margin: auto;
     .top {
       display: flex;
@@ -296,7 +309,7 @@
     }
   }
   .Master-card-buttom {
-    width: 650rpx;
+    width: 85%;
     height: 250rpx;
     margin: auto;
     border: 1rpx solid #b6b5b3;