Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_jishi

manifest.json

@@ -23,8 +23,7 @@
             "OAuth" : {},
             "Maps" : {},
             "Camera" : {},
-            "Record" : {},
-            "Push" : {}
+            "Record" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
@@ -89,9 +88,9 @@
                 "ad" : {},
                 "maps" : {
                     "amap" : {
-                        "appkey_ios" : "0745993c59c890b5bb67ba6595400e76",
-                        "appkey_android" : "eb38bf53409f58cbf43f383cb5733747",
-                        "name" : "amapnk4ecquC"
+                        "appkey_ios" : "078d73c3d9a2dfa551108b1f7e80e4d5",
+                        "appkey_android" : "ddd9f8703b3696ce47216ff7783bbe38",
+                        "name" : "amapAfvorp8OK"
                     }
                 },
                 "push" : {},
@@ -109,33 +108,33 @@
             },
             "icons" : {
                 "android" : {
-                    "hdpi" : "static/logo.png",
-                    "xhdpi" : "static/logo.png",
-                    "xxhdpi" : "static/logo.png",
-                    "xxxhdpi" : "static/logo.png"
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
                 },
                 "ios" : {
-                    "appstore" : "static/logo.png",
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
                     "ipad" : {
-                        "app" : "static/logo.png",
-                        "app@2x" : "static/logo.png",
-                        "notification" : "static/logo.png",
-                        "notification@2x" : "static/logo.png",
-                        "proapp@2x" : "static/logo.png",
-                        "settings" : "static/logo.png",
-                        "settings@2x" : "static/logo.png",
-                        "spotlight" : "static/logo.png",
-                        "spotlight@2x" : "static/logo.png"
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
                     },
                     "iphone" : {
-                        "app@2x" : "static/logo.png",
-                        "app@3x" : "static/logo.png",
-                        "notification@2x" : "static/logo.png",
-                        "notification@3x" : "static/logo.png",
-                        "settings@2x" : "static/logo.png",
-                        "settings@3x" : "static/logo.png",
-                        "spotlight@2x" : "static/logo.png",
-                        "spotlight@3x" : "static/logo.png"
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
                     }
                 }
             },

my/wallet/mymoneydetail.vue

@@ -8,11 +8,11 @@
 						<text v-if="item.type == 2" style="margin-bottom: 8upx;color: #ecd4b4">提现</text>
 					</view> -->
 					<view style="color: #999999;font-size: 28upx;">
-						<view style="margin-bottom: 8upx">{{item.title}}</view>
+						<view style="margin-bottom: 8upx;color: #333; font-size: 32rpx;font-weight: bold;">{{item.title}}</view>
 						<!-- <view v-if="item.classify === 2" style="margin-bottom: 8upx"> 返佣类型：直属返佣</view> -->
 						<!-- <view v-if="item.classify === 3" style="margin-bottom: 8upx"> 返佣类型：非直属支付</view> -->
-						<view style="margin-bottom: 8upx">{{item.content}}</view>
-						<view style="margin-bottom: 8upx"> 创建时间：{{item.createTime}}</view>
+						<view style="margin-bottom: 8upx; font-size: 29.6rpx; color: #666; margin-top: 20rpx;">{{item.content}}</view>
+						<view style="margin-bottom: 8upx; font-size: 24rpx; color: #999;margin-top: 20rpx;"> 下单时间：{{item.createTime}}</view>
 						<view style="margin-bottom: 8upx;text-align: right;">
 							<text v-if="item.type == 1" class="text-olive" style="font-size: 32upx;font-weight: 600"><text class="text-olive">+</text>{{item.money}}元</text>
 							<text v-if="item.type == 2" class="text-red" style="font-size: 32upx;font-weight: 600"><text class="text-red">-</text>{{item.money}}元</text>
@@ -94,7 +94,7 @@
 
 <style lang="less">
 	page {
-		background: #FFFFFF;
+		background: #f7f7f7;
 	}
 
 	.tui-tab-item-title {
@@ -120,7 +120,6 @@
 		padding: 32rpx;
 		margin: 32rpx;
 		font-size: 28rpx;
-		box-shadow: 7px 9px 34px rgba(0, 0, 0, 0.1);
 		border-radius: 16upx;
 	}
 </style>

pages/index/index.vue

@@ -80,10 +80,15 @@
 				<view class="djtit">当前等级</view>
 				<view class="djimg" @click="level">{{ currentGrade ? currentGrade : "A0" }}</view>
 				<view class="" style="margin-top: 20px;">
-					<text style="font-size: 30px;font-weight: bold;">{{ currentWholeIncome ? currentWholeIncome : 0 }}</text>
-					<text style="font-size: 16px;">/{{ totalIncomeRange ? totalIncomeRange : 4000 }}</text>
+					<!-- <text style="font-size: 30px;font-weight: bold;">当前业绩：{{ currentWholeIncome ? currentWholeIncome : 0 }}</text> -->
+					<!-- <text style="font-size: 16px;">/{{ totalIncomeRange ? totalIncomeRange : 4000 }}</text> -->
 				</view>
-				<u-line-progress active-color="#46a396" :show-percent="false" :height="38" inactive-color="#098f7a"
+				
+				<view class="" style="margin-top: 20px;">
+					<text style="font-size: 30px;font-weight: bold;">当前业绩：{{ currentWholeIncome ? currentWholeIncome : 0 }}</text>
+					<!-- <text style="font-size: 16px;">/{{ totalIncomeRange ? totalIncomeRange : 4000 }}</text> -->
+				</view>
+				<!-- <u-line-progress active-color="#46a396" :show-percent="false" :height="38" inactive-color="#098f7a"
 					:percent="lineProgressData" :striped-active="true"></u-line-progress>
 
 				<view v-if="!maxStatus && longUpgradeDescriptionSet.differenceOutstandingAchievement" class="dengji-text">
@@ -113,7 +118,7 @@
 							</view>
 						</view>
 					</u-popup>
-				</view>
+				</view> -->
 				<view class="flex align-center"
 					style="justify-content: space-evenly;text-align: center;">
 					<view class="" @click="dangqian">