소스 검색

2022-1-31

cmy 2 년 전
부모
커밋
b927808795

+ 18 - 0
.gitignore

@@ -0,0 +1,18 @@
+.DS_Store
+node_modules
+dist
+.env.local
+.env.*.local
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+.idea
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+public/video
+*.zip
+*.7z
+package-lock.json

+ 37 - 3
manifest.json

@@ -1,6 +1,6 @@
 {
-    "name" : "康轻体",
-    "appid" : "__UNI__55B611E",
+    "name" : "宏根蒂",
+    "appid" : "__UNI__D811809",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -37,7 +37,8 @@
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
             },
             "ios" : {
-                "idfa" : false
+                "idfa" : false,
+                "dSYMs" : false
             },
             /* ios打包配置 */
             "sdkConfigs" : {
@@ -48,6 +49,39 @@
                         "appsecret" : "",
                         "UniversalLinks" : ""
                     }
+                },
+                "ad" : {}
+            },
+            "icons" : {
+                "android" : {
+                    "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" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "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" : "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"
+                    }
                 }
             }
         }

+ 1 - 1
pages.json

@@ -372,7 +372,7 @@
 	},
 	"tabBar": {
 		"color": "#C0C4CC",
-		"selectedColor": "#9DD04D",
+		"selectedColor": "#ffb605",
 		"borderStyle": "black",
 		"backgroundColor": "#ffffff",
 		"list": [{

+ 15 - 4
pages/index/actionDetail.vue

@@ -9,12 +9,15 @@
 				<view class="if-level">
 					品牌经纪人
 				</view>
-				<view class="if-status">
+				<view v-if="!detail.partake" class="if-status">
 					{{userInfo.level > 0 ?'您已满足参与条件': '您未满足参与条件'}}
 				</view>
-				<view class="add-btn" :class="{'cant': userInfo.level == 0}" @click="add()">
+				<view class="add-btn" v-if="!detail.partake" :class="{'cant': userInfo.level == 0}" @click="add()">
 					立即参与
 				</view>
+				<view class="add-btn bg-gray"  v-else  >
+					已参与
+				</view>
 			</view>
 		</view>
 		<view class="add-recoed flex">
@@ -61,7 +64,6 @@
 		onLoad(opt) {
 			this.id = opt.id
 			this.getUser()
-			
 		},
 		onShow() {
 			
@@ -93,10 +95,16 @@
 				})
 			},
 			add() {
+				uni.showLoading({
+					title: '报名中',
+					mask: true
+				});
 				addAction({
 					out_id: this.id
 				}).then(res => {
-				
+					uni.hideLoading()
+				}).catch(()=>{
+					uni.hideLoading()
 				})
 			}
 		}
@@ -151,6 +159,9 @@
 			color: #6B4216;
 			text-align: center;
 			margin: 30rpx auto 20rpx;
+			&.bg-gray{
+				color: #FFFFFF;
+			}
 		}
 	}
 	.add-recoed {

+ 8 - 8
pages/index/index.vue

@@ -42,26 +42,26 @@
 				</view>
 				<view class="item-title">联系客服</view>
 			</view>
-			<view class="cate-item flex" @click="navto('/pages/user/shareQrCode',1)">
+			<!-- <view class="cate-item flex" @click="navto('/pages/user/shareQrCode',1)">
 				<view class="img-wrapper flex">
 					<image src="../../static/index/in4.png" mode=""></image>
 				</view>
 				<view class="item-title">邀请好友</view>
-			</view>
-			<view class="cate-item flex" @click="navto('/pages/user/shareQrCode',1)">
+			</view> -->
+			<!-- <view class="cate-item flex" @click="navto('/pages/user/shareQrCode',1)">
 				<view class="img-wrapper flex">
 					<image src="../../static/index/in5.png" mode=""></image>
 				</view>
 				<view class="item-title">活动专区</view>
-			</view>
+			</view> -->
 		</view>
 		<!-- 分类 ed -->
 		<view class="jg">
 
 		</view>
-		<view class="hdlist" @click="navTo('/pages/index/actionList')">
-			<image src="../../static/index/ryc.png" mode="widthFix"></image>
-			<image src="../../static/index/xny.png" mode="widthFix"></image>
+		<view class="hdlist" >
+			<image src="../../static/index/ryc.png" @click="navTo('/pages/index/actionDetail?id=1')" mode="widthFix"></image>
+			<image src="../../static/index/xny.png" @click="navTo('/pages/index/actionDetail?id=2')" mode="widthFix"></image>
 		</view>
 		<!-- 商品列表 start -->
 		<view class="product-box">
@@ -151,7 +151,7 @@
 	export default {
 		data() {
 			return {
-				text: '', //客服微信
+				text: 'shxsophina', //客服微信
 				page: 1,
 				limitt: 20,
 				loadingType: 'more',

+ 3 - 3
pages/public/login.vue

@@ -359,15 +359,15 @@ page {
 
 	.uni-button-green {
 		color: #ffffff;
-		background-color: #5dbc7c;
+		background-color: $base-color;
 		margin: 40rpx 10rpx;
 		border-radius: 50rpx;
 	}
 	.uni-button-green-plain {
-		border: 1px solid #5dbc7c;
+		border: 1px solid $base-color;
 		margin: 40rpx 10rpx;
 		border-radius: 50rpx;
-		color: #5dbc7c;
+		color: $base-color;
 		background-color: #ffffff;
 	}
 	.uni-button {

+ 7 - 7
pages/public/register.vue

@@ -21,13 +21,13 @@
 				<view class="login_img"><image src="/static/icon/img07.png"></image></view>
 				<view class="login_name"><input class="uni-input" type="text" v-model="invitation" focus placeholder="请输入邀请码" /></view>
 			</view>
-			<view class="login_input flex">
+			<!-- <view class="login_input flex">
 				<view class="login_img"><image src="/static/icon/img06.png"></image></view>
 				<view class="login_name flex">
 					<input class="uni-input width" v-model="code" focus placeholder="请输入验证码" />
 					<view class="code" @click="verification">{{ countDown == 0 ? '验证码' : countDown }}</view>
 				</view>
-			</view>
+			</view> -->
 			<view><button type="green" @click="register" class="uni-button uni-button-green">注册账号</button></view>
 			<view><button class="uni-button uni-button-green uni-button-green-plain" type="green" plain="true" hover-class="none" @click="login">返回登录</button></view>
 		</view>
@@ -42,7 +42,7 @@ export default {
 			password: '', //密码
 			repassword: '',
 			invitation: '', //邀请码
-			code: '', //验证码
+			code: 123456, //验证码
 			time: '', //保存倒计时对象
 			countDown: 0 ,//倒计时
 		};
@@ -229,15 +229,15 @@ page {
 
 	.uni-button-green {
 		color: #ffffff;
-		background-color: #5dbc7c;
+		background-color: $base-color;
 		margin: 40rpx 10rpx;
 		border-radius: 50rpx;
 	}
 	.uni-button-green-plain {
-		border: 1px solid #5dbc7c;
+		border: 1px solid $base-color;
 		margin: 40rpx 10rpx;
 		border-radius: 50rpx;
-		color: #5dbc7c;
+		color: $base-color;
 		background-color: #ffffff;
 	}
 	.uni-button {
@@ -265,7 +265,7 @@ page {
 	width: 325rpx !important;
 }
 .code {
-	color: #5dbc7c;
+	color: $base-color;
 	font-size: 23rpx;
 	border-left: 1px solid #eeeeee;
 	width: 150rpx;

+ 20 - 17
pages/user/user.vue

@@ -12,7 +12,7 @@
 				<image class="avatar" src="../../static/error/missing-face.png" mode="" v-else></image>
 				<view class="user-name-id">
 					<view class="user-name clamp2">{{userInfo.nickname  || '游客'}}</view>
-					<view class="user-uid">{{userInfo.phone || ''}}</view>
+					<view class="user-uid">邀请码:{{userInfo.uid || ''}}</view>
 				</view>
 			</view>
 			<view class="flex yexq">
@@ -30,7 +30,7 @@
 				</view>
 			</view>
 			<view class="u-set" v-if="userInfo && userInfo.level > 0">
-				<image src="../../static/icon/vip.png" mode="widthFix" class=""  ></image>
+				<image src="../../static/icon/vip.png" mode="widthFix"></image>
 				<view class="u-set-tit">
 					{{userInfo.level == 4 ?'创业合伙人': (userInfo.level == 3 ?'城市合伙人':(userInfo.level == 2 ?'团购经纪人':'vip'))}}
 				</view>
@@ -57,12 +57,12 @@
 					</view>
 					<view class="oitem-font">我的积分</view>
 				</view>
-				<view class="oitem" @click="navTo('/pages/order/order?state=2')">
+				<!-- <view class="oitem" @click="navTo('/pages/order/order?state=2')">
 					<view class="oitem-val">
 						{{0}}
 					</view>
 					<view class="oitem-font">优惠券</view>
-				</view>
+				</view> -->
 			</view>
 		</view>
 		<view class="main-box">
@@ -101,13 +101,13 @@
 				</view>
 				<image src="../../static/icon/back.png" mode="" class="right-img"></image>
 			</view>
-			<view class="user-list flex" @click="navTo('/pages/user/shareQrCode')">
+			<!-- <view class="user-list flex" @click="navTo('/pages/user/shareQrCode')">
 				<image src="../../static/icon/gift.png" mode="" class="left-img"></image>
 				<view class="">
 					推广海报
 				</view>
 				<image src="../../static/icon/back.png" mode="" class="right-img"></image>
-			</view>
+			</view> -->
 			<view class="user-list flex" @click="navTo('/pages/set/address')">
 				<image src="../../static/icon/u2.png" mode="" class="left-img"></image>
 				<view class="">
@@ -187,7 +187,7 @@
 				store_name: '',
 				achievement: '',
 				code: '',
-				text: '' //客服微信
+				text: 'shxsophina' //客服微信
 			};
 		},
 		onShow() {
@@ -541,23 +541,26 @@
 			position: absolute;
 			top: 85rpx;
 			right: 0rpx;
-			width: 178rpx;
-			height: 60rpx;
+			height: 56rpx;
+			border-bottom-left-radius:100rpx ;
+			border-top-left-radius:100rpx ;
+			background-color: #d5b861;
 			image {
 				width: 178rpx;
-				position: relative;
-			}
-			.u-set-tit {
+				height: 56rpx;
 				position: absolute;
-				width: 120rpx;
-				height: 60rpx;
 				text-align: center;
 				top: 0;
-				right: 0;
+				left: 0;
+			}
+			.u-set-tit {
+				position: relative;
+				padding-left: 60rpx;
+				height: 56rpx;
+				line-height: 56rpx;
 				font-size: 22rpx;
 				padding-right: 10rpx;
-				line-height: 60rpx;
-				
+				color: #666666;
 			}
 		}
 

+ 1 - 1
static/css/cmy.css

@@ -502,7 +502,7 @@
 }
 
 .bg-gray {
-	background-color: #e3e3e3 !important;
+	background: #e3e3e3 !important;
 }
 
 /* 边框 */

BIN
static/img/img01.png


BIN
static/tabBar/cart-action.png


BIN
static/tabBar/cart.png


BIN
static/tabBar/cate-action.png


BIN
static/tabBar/cate.png


BIN
static/tabBar/home-action.png


BIN
static/tabBar/home.png


BIN
static/tabBar/user-action.png


BIN
static/tabBar/user.png


+ 1 - 1
uni.scss

@@ -4,7 +4,7 @@ $page-row-spacing: 30rpx;
 $page-color-base: #f8f8f8;//页面背景颜色
 $page-color-light: #f8f6fc;
 // 主题颜色
-$base-color: #ff4e4a;//项目颜色
+$base-color: #ffb605;//项目颜色
 $box-shadow-color:#5dbc7c;//阴影颜色
 $font-color:#5dbc7c;//字体颜色
 $font-color-spec: #5dbc7c;//可操作文字颜色

BIN
unpackage/AppConfig/图标/app图标.png


BIN
unpackage/AppConfig/证书/安卓证书/hongjiu.keystore


+ 2 - 0
unpackage/AppConfig/证书/安卓证书/证书信息.txt

@@ -0,0 +1,2 @@
+别名:hongjiu.com 密码:112233
+包名:hongjiu.com

BIN
unpackage/res/icons/1024x1024.png


BIN
unpackage/res/icons/120x120.png


BIN
unpackage/res/icons/144x144.png


BIN
unpackage/res/icons/152x152.png


BIN
unpackage/res/icons/167x167.png


BIN
unpackage/res/icons/180x180.png


BIN
unpackage/res/icons/192x192.png


BIN
unpackage/res/icons/20x20.png


BIN
unpackage/res/icons/29x29.png


BIN
unpackage/res/icons/40x40.png


BIN
unpackage/res/icons/58x58.png


BIN
unpackage/res/icons/60x60.png


BIN
unpackage/res/icons/72x72.png


BIN
unpackage/res/icons/76x76.png


BIN
unpackage/res/icons/80x80.png


BIN
unpackage/res/icons/87x87.png


BIN
unpackage/res/icons/96x96.png