py 2 yıl önce
ebeveyn
işleme
44601e5f1e
5 değiştirilmiş dosya ile 317 ekleme ve 161 silme
  1. 2 2
      .env.js
  2. 266 128
      common/css/common.css
  3. 1 1
      manifest.json
  4. 30 12
      pages-my/user-info.vue
  5. 18 18
      pages/index/index.vue

+ 2 - 2
.env.js

@@ -3,8 +3,8 @@ let ENV_CONFIG = null;
 
 
 if (nodeEnv === 'development') {
 if (nodeEnv === 'development') {
     //开发环境
     //开发环境
-    // ENV_CONFIG = require('.env.prod.js');
-	ENV_CONFIG = require('.env.dev.js');
+    ENV_CONFIG = require('.env.prod.js');
+	// ENV_CONFIG = require('.env.dev.js');
 } else {
 } else {
     //生产环境
     //生产环境
     ENV_CONFIG = require('.env.prod.js');
     ENV_CONFIG = require('.env.prod.js');

+ 266 - 128
common/css/common.css

@@ -1,37 +1,44 @@
 body {
 body {
-  background-color: #F5F5F5;
+	background-color: #F5F5F5;
 }
 }
-view,text {
-  font-size: 24rpx;
-  color: #333;
+
+view,
+text {
+	font-size: 24rpx;
+	color: #333;
 }
 }
+
 image {
 image {
-  display: block;
+	display: block;
 }
 }
 
 
 
 
 /* 隐藏scroll-view 滚动条 */
 /* 隐藏scroll-view 滚动条 */
 ::-webkit-scrollbar {
 ::-webkit-scrollbar {
-  display: none;
+	display: none;
 }
 }
 
 
 .iPhone-bottom {
 .iPhone-bottom {
 	padding-bottom: constant(safe-area-inset-bottom);
 	padding-bottom: constant(safe-area-inset-bottom);
 	padding-bottom: env(safe-area-inset-bottom);
 	padding-bottom: env(safe-area-inset-bottom);
 }
 }
+
 /* 不换行 */
 /* 不换行 */
-.view-nowrap{
+.view-nowrap {
 	white-space: nowrap;
 	white-space: nowrap;
 }
 }
+
 .z-index-max {
 .z-index-max {
 	position: relative;
 	position: relative;
 	z-index: 99999;
 	z-index: 99999;
 }
 }
+
 /* 自动换行 */
 /* 自动换行 */
-.view-word-wrap{
+.view-word-wrap {
 	white-space: pre-wrap;
 	white-space: pre-wrap;
 	word-wrap: break-word;
 	word-wrap: break-word;
 }
 }
+
 /*超出三行... */
 /*超出三行... */
 .text-overflow-ellipsis-t {
 .text-overflow-ellipsis-t {
 	text-overflow: -o-ellipsis-lastline;
 	text-overflow: -o-ellipsis-lastline;
@@ -65,8 +72,9 @@ image {
 	overflow: hidden;
 	overflow: hidden;
 	word-break: break-all;
 	word-break: break-all;
 }
 }
+
 /* 内部盒子 */
 /* 内部盒子 */
-.box-border-box{
+.box-border-box {
 	box-sizing: border-box;
 	box-sizing: border-box;
 }
 }
 
 
@@ -76,19 +84,23 @@ image {
 	display: flex;
 	display: flex;
 	flex-direction: column;
 	flex-direction: column;
 }
 }
+
 .flex-index-css {
 .flex-index-css {
 	width: 100%;
 	width: 100%;
 	height: 100%;
 	height: 100%;
 	display: flex;
 	display: flex;
 	flex-direction: column;
 	flex-direction: column;
 }
 }
+
 .flex-direction {
 .flex-direction {
-  display: flex;
-  flex-direction: column;
+	display: flex;
+	flex-direction: column;
 }
 }
+
 .display-flex {
 .display-flex {
 	display: flex;
 	display: flex;
 }
 }
+
 .flex-justify-space {
 .flex-justify-space {
 	display: flex;
 	display: flex;
 	justify-content: space-between;
 	justify-content: space-between;
@@ -103,443 +115,569 @@ image {
 	display: flex;
 	display: flex;
 	justify-content: center;
 	justify-content: center;
 }
 }
+
 .flex-justify-end {
 .flex-justify-end {
 	display: flex;
 	display: flex;
 	justify-content: flex-end;
 	justify-content: flex-end;
 }
 }
+
 .flex-justify-start {
 .flex-justify-start {
 	display: flex;
 	display: flex;
 	justify-content: flex-start;
 	justify-content: flex-start;
 }
 }
+
 .align-items-center {
 .align-items-center {
 	display: flex;
 	display: flex;
 	align-items: center;
 	align-items: center;
 }
 }
+
 .align-items-flex-end {
 .align-items-flex-end {
 	display: flex;
 	display: flex;
 	align-items: flex-end;
 	align-items: flex-end;
 }
 }
+
 .align-items-flex-start {
 .align-items-flex-start {
 	display: flex;
 	display: flex;
 	align-items: flex-start;
 	align-items: flex-start;
 }
 }
+
 .flex-wrap-wrap {
 .flex-wrap-wrap {
 	display: flex;
 	display: flex;
 	flex-wrap: wrap;
 	flex-wrap: wrap;
 }
 }
-.common-view-css{
+
+.common-view-css {
 	width: 100%;
 	width: 100%;
 	flex: 1;
 	flex: 1;
 }
 }
+
 .scroll-view-css {
 .scroll-view-css {
 	width: 100%;
 	width: 100%;
 	flex: 1;
 	flex: 1;
 	overflow: auto;
 	overflow: auto;
 }
 }
+
 .box-sizing-border {
 .box-sizing-border {
 	box-sizing: border-box;
 	box-sizing: border-box;
 }
 }
+
 .text-align-center {
 .text-align-center {
 	text-align: center;
 	text-align: center;
 }
 }
+
 .text-align-right {
 .text-align-right {
 	text-align: right;
 	text-align: right;
 }
 }
+
 .text-align-left {
 .text-align-left {
 	text-align: left;
 	text-align: left;
 }
 }
-.flex-1{
+
+.flex-1 {
 	flex: 1;
 	flex: 1;
 }
 }
-.flex-shrink0{
+
+.flex-shrink0 {
 	flex-shrink: 0;
 	flex-shrink: 0;
 }
 }
 
 
 /* 字体大小 */
 /* 字体大小 */
-.fs-20{
+.fs-20 {
 	font-size: 20rpx;
 	font-size: 20rpx;
 }
 }
-.fs-22{
+
+.fs-22 {
 	font-size: 22rpx;
 	font-size: 22rpx;
 }
 }
-.fs-24{
+
+.fs-24 {
 	font-size: 24rpx;
 	font-size: 24rpx;
 }
 }
-.fs-26{
+
+.fs-26 {
 	font-size: 26rpx;
 	font-size: 26rpx;
 }
 }
-.fs-28{
+
+.fs-28 {
 	font-size: 28rpx;
 	font-size: 28rpx;
 }
 }
-.fs-30{
+
+.fs-30 {
 	font-size: 30rpx;
 	font-size: 30rpx;
 }
 }
-.fs-32{
+
+.fs-32 {
 	font-size: 32rpx;
 	font-size: 32rpx;
 }
 }
-.fs-34{
+
+.fs-34 {
 	font-size: 34rpx;
 	font-size: 34rpx;
 }
 }
-.fs-36{
+
+.fs-36 {
 	font-size: 36rpx;
 	font-size: 36rpx;
 }
 }
-.fs-38{
+
+.fs-38 {
 	font-size: 38rpx;
 	font-size: 38rpx;
 }
 }
-.fs-40{
+
+.fs-40 {
 	font-size: 40rpx;
 	font-size: 40rpx;
 }
 }
-.fs-44{
+
+.fs-44 {
 	font-size: 44rpx;
 	font-size: 44rpx;
 }
 }
-.fs-48{
+
+.fs-48 {
 	font-size: 48rpx;
 	font-size: 48rpx;
 }
 }
-.fs-64{
+
+.fs-64 {
 	font-size: 64rpx;
 	font-size: 64rpx;
 }
 }
 
 
 /* 字体下面横线 */
 /* 字体下面横线 */
-.text-underline{
+.text-underline {
 	text-decoration: underline;
 	text-decoration: underline;
 }
 }
+
 /* 字体中间横线 */
 /* 字体中间横线 */
-.text-line-through{
-	text-decoration:line-through
+.text-line-through {
+	text-decoration: line-through
 }
 }
 
 
 /* 字体粗细 */
 /* 字体粗细 */
-.fw-b{
+.fw-b {
 	font-weight: bold;
 	font-weight: bold;
 }
 }
-.fw-400{
+
+.fw-400 {
 	font-weight: 400;
 	font-weight: 400;
 }
 }
-.fw-500{
+
+.fw-500 {
 	font-weight: 500;
 	font-weight: 500;
 }
 }
-.fw-600{
+
+.fw-600 {
 	font-weight: 600;
 	font-weight: 600;
 }
 }
 
 
 /* 字体颜色 */
 /* 字体颜色 */
-.fc-f{
+.fc-f {
 	color: #fff;
 	color: #fff;
 }
 }
-.fc-0{
+
+.fc-0 {
 	color: #000;
 	color: #000;
 }
 }
-.fc-3{
+
+.fc-3 {
 	color: #333;
 	color: #333;
 }
 }
-.fc-6{
+
+.fc-6 {
 	color: #666;
 	color: #666;
 }
 }
-.fc-9198A2{
+
+.fc-9198A2 {
 	color: #9198A2;
 	color: #9198A2;
 }
 }
-.fc-9{
+
+.fc-9 {
 	color: #999;
 	color: #999;
 }
 }
-.fc-41ABF5{
+
+.fc-41ABF5 {
 	color: #41ABF5;
 	color: #41ABF5;
 }
 }
-.fc-57CAFF{
+
+.fc-57CAFF {
 	color: #57CAFF;
 	color: #57CAFF;
 }
 }
-.fc-FB3D03{
+
+.fc-FB3D03 {
 	color: #ff3422;
 	color: #ff3422;
 }
 }
-.fc-ff3939{
+
+.fc-ff3939 {
 	color: #ff3939;
 	color: #ff3939;
 }
 }
-.fc-FF7F00{
+
+.fc-FF7F00 {
 	color: #FF7F00;
 	color: #FF7F00;
 }
 }
-.fc-FD5C02{
+
+.fc-FD5C02 {
 	color: #FD5C02;
 	color: #FD5C02;
 }
 }
-.fc-ED301D{
+
+.fc-ED301D {
 	color: #ED301D;
 	color: #ED301D;
 }
 }
-.fc-ADADAD{
+
+.fc-ADADAD {
 	color: #ADADAD;
 	color: #ADADAD;
 }
 }
-.fc-65420c{
+
+.fc-65420c {
 	color: #65420c;
 	color: #65420c;
 }
 }
-.fc-FE9E11{
+
+.fc-FE9E11 {
 	color: #FE9E11;
 	color: #FE9E11;
 }
 }
+
 /* 背景颜色 */
 /* 背景颜色 */
-.bgc-f{
+.bgc-f {
 	background-color: #fff;
 	background-color: #fff;
 }
 }
-.bgc-3{
+
+.bgc-3 {
 	background-color: #333;
 	background-color: #333;
 }
 }
-.bgc-9{
+
+.bgc-9 {
 	background-color: #999;
 	background-color: #999;
 }
 }
 
 
-.bgc-4FB3EF{
+.bgc-4FB3EF {
 	background-color: #4FB3EF;
 	background-color: #4FB3EF;
 }
 }
-.bgc-41ABF5{
+
+.bgc-41ABF5 {
 	background-color: #41ABF5;
 	background-color: #41ABF5;
-}.bgc-E4F3FD{
+}
+
+.bgc-E4F3FD {
 	background-color: #E4F3FD;
 	background-color: #E4F3FD;
 }
 }
-.bgc-BCEAFF{
+
+.bgc-BCEAFF {
 	background-color: #BCEAFF;
 	background-color: #BCEAFF;
 }
 }
-.bgc-B3DDFB{
+
+.bgc-B3DDFB {
 	background-color: #B3DDFB;
 	background-color: #B3DDFB;
 }
 }
-.bgc-ECF7FE{
+
+.bgc-ECF7FE {
 	background-color: #ECF7FE;
 	background-color: #ECF7FE;
 }
 }
-.bgc-FCE7E2{
+
+.bgc-FCE7E2 {
 	background-color: #FCE7E2;
 	background-color: #FCE7E2;
 }
 }
-.bgc-F4F5F7{
+
+.bgc-F4F5F7 {
 	background-color: #F4F5F7;
 	background-color: #F4F5F7;
 }
 }
-.bgc-F2F2F2{
+
+.bgc-F2F2F2 {
 	background-color: #F2F2F2;
 	background-color: #F2F2F2;
 }
 }
-.bgc-E6E6E6{
+
+.bgc-E6E6E6 {
 	background-color: #E6E6E6;
 	background-color: #E6E6E6;
 }
 }
-.bgc-F6F6F6{
+
+.bgc-F6F6F6 {
 	background-color: #F6F6F6;
 	background-color: #F6F6F6;
 }
 }
-.bgc-FB3D03{
+
+.bgc-FB3D03 {
 	background-color: #FB3D03;
 	background-color: #FB3D03;
 }
 }
-.bgc-F5F4F9{
+
+.bgc-F5F4F9 {
 	background-color: #F5F4F9;
 	background-color: #F5F4F9;
 }
 }
-.bgc-F3F4F6{
+
+.bgc-F3F4F6 {
 	background-color: #F3F4F6;
 	background-color: #F3F4F6;
 }
 }
-.bgc-D5EDFB{
+
+.bgc-D5EDFB {
 	background-color: #D5EDFB;
 	background-color: #D5EDFB;
 }
 }
-.b-b-F9F9F9{
+
+.b-b-F9F9F9 {
 	border-bottom: 1rpx solid #F9F9F9;
 	border-bottom: 1rpx solid #F9F9F9;
 }
 }
 
 
 
 
 
 
 /* 圆角 */
 /* 圆角 */
-.b-rad-12{
+.b-rad-12 {
 	border-radius: 12rpx;
 	border-radius: 12rpx;
 }
 }
-.b-rad-16{
+
+.b-rad-16 {
 	border-radius: 16rpx;
 	border-radius: 16rpx;
 }
 }
-.b-rad-20{
+
+.b-rad-20 {
 	border-radius: 20rpx;
 	border-radius: 20rpx;
 }
 }
-.b-rad-200{
+
+.b-rad-200 {
 	border-radius: 200rpx;
 	border-radius: 200rpx;
 }
 }
-.b-rad-50{
+
+.b-rad-50 {
 	border-radius: 50%;
 	border-radius: 50%;
 }
 }
 
 
 /* 内边距 */
 /* 内边距 */
-.p-8{
+.p-8 {
 	padding: 8rpx;
 	padding: 8rpx;
 }
 }
-.p-16{
+
+.p-16 {
 	padding: 16rpx;
 	padding: 16rpx;
 }
 }
-.p-20{
+
+.p-20 {
 	padding: 20rpx;
 	padding: 20rpx;
 }
 }
-.p-24{
+
+.p-24 {
 	padding: 24rpx;
 	padding: 24rpx;
 }
 }
-.p-32{
+
+.p-32 {
 	padding: 32rpx;
 	padding: 32rpx;
 }
 }
+
 .p-t-4 {
 .p-t-4 {
 	padding-top: 4rpx;
 	padding-top: 4rpx;
 }
 }
+
 .p-t-10 {
 .p-t-10 {
 	padding-top: 10rpx;
 	padding-top: 10rpx;
 }
 }
-.p-t-20{
+
+.p-t-20 {
 	padding-top: 20rpx;
 	padding-top: 20rpx;
 }
 }
+
 .pb-5 {
 .pb-5 {
 	padding-bottom: 5rpx;
 	padding-bottom: 5rpx;
 }
 }
+
 .pb-10 {
 .pb-10 {
 	padding-bottom: 10rpx;
 	padding-bottom: 10rpx;
 }
 }
+
 .p-b-20 {
 .p-b-20 {
 	padding-bottom: 20rpx;
 	padding-bottom: 20rpx;
 }
 }
+
 .pb-36 {
 .pb-36 {
 	padding-bottom: 36rpx;
 	padding-bottom: 36rpx;
 }
 }
-.plr-12{
+
+.plr-12 {
 	padding: 0 12rpx;
 	padding: 0 12rpx;
 }
 }
-.plr-24{
+
+.plr-24 {
 	padding: 0 24rpx;
 	padding: 0 24rpx;
 }
 }
-.plr-32{
+
+.plr-32 {
 	padding: 0 32rpx;
 	padding: 0 32rpx;
 }
 }
-.ptp-24{
+
+.ptp-24 {
 	padding: 24rpx 0;
 	padding: 24rpx 0;
 }
 }
+
 .p-12-24 {
 .p-12-24 {
 	padding: 12rpx 24rpx;
 	padding: 12rpx 24rpx;
 }
 }
+
 .pl-24 {
 .pl-24 {
 	padding-left: 24rpx;
 	padding-left: 24rpx;
 }
 }
+
 .pr-24 {
 .pr-24 {
 	padding-right: 24rpx;
 	padding-right: 24rpx;
 }
 }
+
 /* 外边距 */
 /* 外边距 */
-.m-24{
+.m-24 {
 	margin: 24rpx;
 	margin: 24rpx;
 }
 }
-.mt-4{
+
+.mt-4 {
 	margin-top: 4rpx;
 	margin-top: 4rpx;
 }
 }
-.mt-5{
+
+.mt-5 {
 	margin-top: 5rpx;
 	margin-top: 5rpx;
 }
 }
-.mt-24{
+
+.mt-24 {
 	margin-top: 24rpx;
 	margin-top: 24rpx;
 }
 }
 
 
-.ml-2{
+.ml-2 {
 	margin-left: 2rpx;
 	margin-left: 2rpx;
 }
 }
-.ml-10{
+
+.ml-10 {
 	margin-left: 10rpx;
 	margin-left: 10rpx;
 }
 }
-.ml-16{
+
+.ml-16 {
 	margin-left: 16rpx;
 	margin-left: 16rpx;
 }
 }
-.ml-40{
+
+.ml-40 {
 	margin-left: 40rpx;
 	margin-left: 40rpx;
 }
 }
 
 
-.mr-4{
+.mr-4 {
 	margin-right: 4rpx;
 	margin-right: 4rpx;
 }
 }
-.mr-6{
+
+.mr-6 {
 	margin-right: 6rpx;
 	margin-right: 6rpx;
 }
 }
-.mr-8{
+
+.mr-8 {
 	margin-right: 8rpx;
 	margin-right: 8rpx;
 }
 }
-.mr-12{
+
+.mr-12 {
 	margin-right: 12rpx;
 	margin-right: 12rpx;
 }
 }
-.mr-16{
+
+.mr-16 {
 	margin-right: 16rpx;
 	margin-right: 16rpx;
 }
 }
-.mr-18{
+
+.mr-18 {
 	margin-right: 18rpx;
 	margin-right: 18rpx;
 }
 }
-.mr-20{
+
+.mr-20 {
 	margin-right: 20px;
 	margin-right: 20px;
 }
 }
-.mr-24{
+
+.mr-24 {
 	margin-right: 24rpx;
 	margin-right: 24rpx;
 }
 }
-.mr-30{
+
+.mr-30 {
 	margin-right: 30rpx;
 	margin-right: 30rpx;
 }
 }
-.mr-36{
+
+.mr-36 {
 	margin-right: 36rpx;
 	margin-right: 36rpx;
 }
 }
-.mr-40{
+
+.mr-40 {
 	margin-right: 40px;
 	margin-right: 40px;
 }
 }
-.mr-46{
+
+.mr-46 {
 	margin-right: 46rpx;
 	margin-right: 46rpx;
 }
 }
 
 
 
 
-.mb-2{
+.mb-2 {
 	margin-bottom: 2rpx;
 	margin-bottom: 2rpx;
 }
 }
-.mb-4{
+
+.mb-4 {
 	margin-bottom: 4rpx;
 	margin-bottom: 4rpx;
 }
 }
-.mb-8{
+
+.mb-8 {
 	margin-bottom: 8rpx;
 	margin-bottom: 8rpx;
 }
 }
-.mb-10{
+
+.mb-10 {
 	margin-bottom: 10rpx;
 	margin-bottom: 10rpx;
 }
 }
-.mb-12{
+
+.mb-12 {
 	margin-bottom: 12rpx;
 	margin-bottom: 12rpx;
 }
 }
-.mb-16{
+
+.mb-16 {
 	margin-bottom: 16rpx;
 	margin-bottom: 16rpx;
 }
 }
-.mb-18{
+
+.mb-18 {
 	margin-bottom: 18rpx;
 	margin-bottom: 18rpx;
 }
 }
-.mb-20{
+
+.mb-20 {
 	margin-bottom: 20rpx;
 	margin-bottom: 20rpx;
 }
 }
-.mb-22{
+
+.mb-22 {
 	margin-bottom: 22rpx;
 	margin-bottom: 22rpx;
 }
 }
-.mb-24{
+
+.mb-24 {
 	margin-bottom: 24rpx;
 	margin-bottom: 24rpx;
 }
 }
-.mb-26{
+
+.mb-26 {
 	margin-bottom: 26rpx;
 	margin-bottom: 26rpx;
 }
 }
-.mb-28{
+
+.mb-28 {
 	margin-bottom: 28rpx;
 	margin-bottom: 28rpx;
 }
 }
-.mb-32{
+
+.mb-32 {
 	margin-bottom: 32rpx;
 	margin-bottom: 32rpx;
 }
 }
-.mb-40{
+
+.mb-40 {
 	margin-bottom: 40rpx;
 	margin-bottom: 40rpx;
 }
 }
-.mb-48{
+
+.mb-48 {
 	margin-bottom: 48rpx;
 	margin-bottom: 48rpx;
 }
 }
-.mb-50{
+
+.mb-50 {
 	margin-bottom: 50rpx;
 	margin-bottom: 50rpx;
 }
 }
-.mb-52{
+
+.mb-52 {
 	margin-bottom: 52rpx;
 	margin-bottom: 52rpx;
 }
 }
-.mb-60{
+
+.mb-60 {
 	margin-bottom: 60rpx;
 	margin-bottom: 60rpx;
 }
 }
-.mb-64{
+
+.mb-64 {
 	margin-bottom: 64rpx;
 	margin-bottom: 64rpx;
 }
 }
-.mb-80{
+
+.mb-80 {
 	margin-bottom: 80rpx;
 	margin-bottom: 80rpx;
 }
 }
 
 
 /* 宽度 */
 /* 宽度 */
-.w-100{
+.w-100 {
 	width: 100rpx;
 	width: 100rpx;
 }
 }
-.w-200{
+
+.w-200 {
 	width: 200rpx;
 	width: 200rpx;
 }
 }
-.w-10030{
+
+.w-10030 {
 	width: 30%;
 	width: 30%;
 }
 }

+ 1 - 1
manifest.json

@@ -99,7 +99,7 @@
             "https" : false,
             "https" : false,
             "proxy" : {
             "proxy" : {
                 "/api" : {
                 "/api" : {
-                    "target" : "https://test-userapi.sjzkeji.com",
+                    "target" : "https://userapi.sjzkeji.com",
                     "changeOrigin" : true,
                     "changeOrigin" : true,
                     "secure" : false,
                     "secure" : false,
                     "pathRewrite" : {
                     "pathRewrite" : {

+ 30 - 12
pages-my/user-info.vue

@@ -4,7 +4,7 @@
 		<scroll-view :scroll-y="true" class="scroll-view-css">
 		<scroll-view :scroll-y="true" class="scroll-view-css">
 			<view class="user-img-box b-rad-50" @click="goToUrl(0)">
 			<view class="user-img-box b-rad-50" @click="goToUrl(0)">
 				<image class="user-img b-rad-50" :src="userInfoData.head_img" mode=""></image>
 				<image class="user-img b-rad-50" :src="userInfoData.head_img" mode=""></image>
-				<image class="set-iimg" src="@/static/img/my/pen.png" mode=""></image>
+				<image v-if="setType == 0" class="set-iimg" src="@/static/img/my/pen.png" mode=""></image>
 			</view>
 			</view>
 			<view class="item-info-box box-border-box">
 			<view class="item-info-box box-border-box">
 				<view class="item-box mb-32 flex-justify-space box-border-box">
 				<view class="item-box mb-32 flex-justify-space box-border-box">
@@ -53,7 +53,10 @@
 	import tools from '@/service/tools';
 	import tools from '@/service/tools';
 	import {
 	import {
 		upLoadingFileOss
 		upLoadingFileOss
-	} from "@/service/upLoadingFile.js"
+	} from "@/service/upLoadingFile.js";
+	import {
+		commonApplet
+	} from "@/api/common.js"
 	export default {
 	export default {
 		data() {
 		data() {
 			return {
 			return {
@@ -64,24 +67,39 @@
 					sex: '',
 					sex: '',
 					msg_count: '',
 					msg_count: '',
 				},
 				},
+				setType: 0
 			};
 			};
 		},
 		},
 		onShow() {
 		onShow() {
 			this.getUserInfo();
 			this.getUserInfo();
 		},
 		},
+		mounted() {
+			this.commonApplet()
+		},
 		methods: {
 		methods: {
+			commonApplet() {
+				commonApplet().then((res) => {
+					if (res.code == 1) {
+						this.setType = res.data
+						console.log(this.setType, '______________');
+						this.$forceUpdate()
+					}
+				})
+			},
 			goToUrl(type) {
 			goToUrl(type) {
 				if (type === 0) {
 				if (type === 0) {
-					uni.chooseImage({
-						count: 1,
-						sizeType: ["compressed", "camera"],
-						sourceType: ["album", "camera"],
-						success: (res) => {
-							res.tempFiles.forEach((file) => {
-								this.uploadingFile(file);
-							})
-						}
-					})
+					if (this.setType == 0) {
+						uni.chooseImage({
+							count: 1,
+							sizeType: ["compressed", "camera"],
+							sourceType: ["album", "camera"],
+							success: (res) => {
+								res.tempFiles.forEach((file) => {
+									this.uploadingFile(file);
+								})
+							}
+						})
+					}
 				} else if (type === 1) {
 				} else if (type === 1) {
 					// 昵称
 					// 昵称
 					uni.navigateTo({
 					uni.navigateTo({

+ 18 - 18
pages/index/index.vue

@@ -40,8 +40,8 @@
 			<!-- 导航 -->
 			<!-- 导航 -->
 			<view class="box-border-box plr-24">
 			<view class="box-border-box plr-24">
 				<view class="nav-list flex-wrap-wrap box-border-box mb-22">
 				<view class="nav-list flex-wrap-wrap box-border-box mb-22">
-					<view class="nav-list-item" v-for="(item,i) in navList" :key="i" @click="toUrl(item.type)">
-						<view class="" v-if="item.appletAudit == 0">
+					<view class="nav-list-item" v-for="(item,i) in navList" :key="i" @click="toUrl(item.type)" v-show="item.appletAudit == 0">
+						<view class="">
 							<image :src="item.img" mode="scaleToFill"></image>
 							<image :src="item.img" mode="scaleToFill"></image>
 							<view class="fs-26 fc-3 text-align-center">{{item.name}}</view>
 							<view class="fs-26 fc-3 text-align-center">{{item.name}}</view>
 						</view>
 						</view>
@@ -375,7 +375,7 @@
 					if (res.code == 1) {
 					if (res.code == 1) {
 						this.navList.forEach((v, k) => {
 						this.navList.forEach((v, k) => {
 							v.appletAudit = 0
 							v.appletAudit = 0
-							if (v.type == 8 || v.type == 9 || v.type == 10 || v.type == 11) {
+							if (v.type == 8 || v.type == 7 || v.type == 9 || v.type == 10 || v.type == 11) {
 								v.appletAudit = res.data
 								v.appletAudit = res.data
 							}
 							}
 						})
 						})
@@ -718,10 +718,10 @@
 			}
 			}
 
 
 			.nav-list {
 			.nav-list {
-				padding: 0 22rpx;
+				// padding: 0 22rpx;
 
 
 				.nav-list-item {
 				.nav-list-item {
-					margin-right: 52rpx;
+					width: 20%;
 					margin-bottom: 16rpx;
 					margin-bottom: 16rpx;
 
 
 					image {
 					image {
@@ -731,22 +731,22 @@
 					}
 					}
 				}
 				}
 
 
-				.nav-list-item:nth-child(7) {
-					margin-right: 42rpx !important;
-				}
+				// .nav-list-item:nth-child(7) {
+				// 	margin-right: 42rpx !important;
+				// }
 
 
-				.nav-list-item:nth-child(8) {
-					margin-right: 46rpx !important;
-				}
+				// .nav-list-item:nth-child(8) {
+				// 	margin-right: 46rpx !important;
+				// }
 
 
-				.nav-list-item:nth-child(9) {
-					margin-right: 44rpx !important;
-				}
+				// .nav-list-item:nth-child(9) {
+				// 	margin-right: 44rpx !important;
+				// }
 
 
-				.nav-list-item:nth-child(5),
-				.nav-list-item:nth-child(10) {
-					margin-right: 0;
-				}
+				// .nav-list-item:nth-child(5),
+				// .nav-list-item:nth-child(10) {
+				// 	margin-right: 0;
+				// }
 			}
 			}
 
 
 			.msg-box {
 			.msg-box {