创客

src/components/custom-tab-bar/custom-tab-bar.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-tabbar :value="activeValue" @change="changeTabbar" zIndex="999" :fixed="true" activeColor="#E96737" :placeholder="true"
+		<u-tabbar :value="activeValue" @change="changeTabbar" zIndex="999" :fixed="true" activeColor="#F9822C" :placeholder="true"
 			:safeAreaInsetBottom="true">
 			<u-tabbar-item :text="item.text" :name="item.name" v-for="(item, index) in list" :key="index">
 				<image class="icon" slot="active-icon" :src="item.selectedIconPath"></image>

src/components/hch-poster/hch-poster.vue

@@ -84,8 +84,8 @@
 				let data = this.posterData
 				let system = this.system
 				let posterTitle = data.title
-				posterTitle.x = this.mainImg.x
-				posterTitle.y = data.title.mt * system.scale
+				posterTitle.x = (system.w - data.title.w * system.scale) / 2
+				posterTitle.y = this.poster.y + data.poster.p + data.title.mt * system.scale
 				return posterTitle
 			},
 			/**
@@ -122,7 +122,7 @@
 					w: data.codeImg.w * system.scale,
 					h: data.codeImg.h * system.scale,
 					x: (system.w - data.codeImg.w * system.scale) / 2.8,
-					y: data.codeImg.mt * system.scale //y需要加上绘图后文本的y
+					y: this.poster.y + data.poster.p + data.codeImg.mt * system.scale //y需要加上绘图后文本的y
 				}
 				return posterCode
 			}
@@ -161,6 +161,7 @@
 				let title = this.title
 				await drawSquarePic(ctx, poster.x, poster.y, poster.w, poster.h, poster.r, poster.url)
 				await drawSquarePic(ctx, mainImg.x, mainImg.y, mainImg.w, mainImg.h, mainImg.r, mainImg.url)
+				// await drawSquarePic(ctx, codeImg.x, codeImg.y, codeImg.w, codeImg.h, codeImg.r, codeImg.url)
 				// 绘制标题 textY 绘制文本的y位置
 				// console.log('creatPoster -> title.x', title.x)
 				let textY = drawTextReturnH(
@@ -179,7 +180,7 @@
 				await drawSquarePic(
 					ctx,
 					codeImg.x,
-					codeImg.y + textY,
+					codeImg.y ,
 					codeImg.w,
 					codeImg.h,
 					codeImg.r,

src/packageGoods/coupon/index.vue

@@ -30,7 +30,7 @@
 						</view>
 					</view>
 					<view class="uradio">
-						<u-radio :customStyle="{ marginBottom: '8px' }" :name="item.id" activeColor="#E96737" size="24"
+						<u-radio :customStyle="{ marginBottom: '8px' }" :name="item.id" activeColor="#F9822C" size="24"
 							@change="exclusive(index)">
 						</u-radio>
 					</view>

src/packageGoods/order/index.vue

@@ -10,7 +10,7 @@
 			<!-- 订单导航 -->
 			<view class="flex order-state-search">
 				<u-tabs @change="changeTab" :scrollable="false" :list="statusArr" lineWidth="20" lineHeight="4"
-					lineColor="#E96737" :activeStyle="{
+					lineColor="#F9822C" :activeStyle="{
 										color: '#333',
 										transform: 'scale(1.1)',
 										width: '50px',

src/packageGoods/order/logistics.vue

@@ -9,7 +9,7 @@
 		<!-- 包裹 -->
 		<view class="pack" v-if="deliverList.length>1">
 			<u-tabs @change="changeTab" :scrollable="false" :list="packList" lineWidth="20" lineHeight="4"
-				lineColor="#E96737" :activeStyle="{
+				lineColor="#F9822C" :activeStyle="{
 									color: '#333',
 									transform: 'scale(1.1)',
 									width: '50px',

src/packageGoods/promoters/index.vue

@@ -19,7 +19,7 @@
 						<text>工号：{{item.workNo}}</text>
 					</view>
 					<view class="uradio">
-						<u-radio :customStyle="{ marginBottom: '8px' }" :name="item.channelId" activeColor="#E96737"
+						<u-radio :customStyle="{ marginBottom: '8px' }" :name="item.channelId" activeColor="#F9822C"
 							size="24">
 						</u-radio>
 					</view>

src/packageOperate/address/create.vue

@@ -112,25 +112,32 @@
 			},
 
 			saveAddress() {
+				if(this.loading) return
+				this.loading = true
 				let _this = this
 				if (!_this.form.receiver) {
+					this.loading = false
 					uni.$u.toast('请输入收货人');
 					return
 				}
 				if (!_this.form.mobile) {
+					this.loading = false
 					uni.$u.toast('请输入手机号码');
 					return
 				}
 				const rule = /^[1][0-9][0-9]{9}$/
 				if (!rule.test(_this.form.mobile)) {
+					this.loading = false
 					uni.$u.toast('请输入正确的手机号');
 					return
 				}
 				if (!_this.form.cityShow) {
+					this.loading = false
 					uni.$u.toast('请选择所在地区');
 					return
 				}
 				if (!_this.form.addr) {
+					this.loading = false
 					uni.$u.toast('请输入详细地址');
 					return
 				}
@@ -139,10 +146,13 @@
 					if (res.code == 0) {
 						uni.$u.toast('保存成功');
 						setTimeout(() => {
+							this.loading = false
 							uni.navigateBack({
 								delta: 1
 							})
 						}, 1000)
+					}else {
+						this.loading = false
 					}
 				})
 			},

src/packageOperate/creator/index.vue

@@ -0,0 +1,178 @@
+<template>
+	<view>
+		//申请创客
+		<!-- #ifdef MP-ALIPAY -->
+		<u-navbar title="申请创客" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" leftIconSize="0" />
+		<!-- #endif -->
+		<!-- #ifndef MP-ALIPAY -->
+		<u-navbar title="申请创客" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
+		<!-- #endif -->
+		<view class="creator">
+			<u-form labelPosition="left" ref="form" labelWidth="90">
+				<u-form-item label="姓名:" borderBottom required>
+					<u-input v-model="form.name" border="none" placeholder="请输入姓名"></u-input>
+				</u-form-item>
+				<u-form-item label="手机号码:" borderBottom required>
+					<u-input v-model="form.phone" type="number" border="none" placeholder="请输入手机号码"></u-input>
+				</u-form-item>
+				<u-form-item label="所在地区:" borderBottom @click="selectArea">
+					<u-input v-model="form.cityShow" border="none" disabled disabledColor="#ffffff" placeholder="请选择地区">
+					</u-input>
+					<u-icon slot="right" name="arrow-right"></u-icon>
+				</u-form-item>
+				<u-form-item label="行业资源:" :borderBottom="false">
+					<u-textarea v-model="form.resource" placeholder="请输入行业资源" count></u-textarea>
+				</u-form-item>
+			</u-form>
+		</view>
+		<!-- 操作按钮 -->
+		<view class="save-btn">
+			<button :loading="loading" type="default" @click="saveCreator">提交</button>
+		</view>
+		
+		<view class="tip">
+			<view class="tip-text">
+				申请成为盲票创客 利用业余时间  推广您公司、家附近门店商户，创客和门店都无需投资、销售额分佣、长期收益 点击提交按钮后，客服会联系您。
+			</view>
+			<view class="tip-phone">
+				<image src="../static/phone.png" mode=""></image>
+				<view class="">
+					咨询电话：400-081-1913
+				</view>
+			</view>
+		</view>
+		
+
+		<area-picker :area-show="areaShow" @cancel="cancel" @confirmArea="confirmArea" />
+	</view>
+</template>
+
+<script>
+	import $http from '@/utils/request.js'
+	import AreaPicker from '../../components/area-picker/area-picker.vue'
+	export default {
+		components: {
+			AreaPicker
+		},
+		data() {
+			return {
+				loading: false,
+				form: {
+					phone: '',
+					name: '',
+					cityShow: '', //省市区拼接
+					resource: '', //行业资源
+					provinceId: '', // 省ID/编码
+					province: '', // 省
+					cityId: '', // 市ID/编码
+					city: '', // 市
+					areaId: '', // 区ID/编码
+					area: '', // 区
+				},
+				areaShow: false,
+			}
+		},
+		methods: {
+
+			//打开地址选项
+			selectArea() {
+				this.areaShow = true
+			},
+			//隐藏地址选项
+			cancel() {
+				this.areaShow = false
+			},
+			confirmArea(obj) {
+				this.form.province = obj.province
+				this.form.provinceId = obj.provinceId
+				this.form.city = obj.city
+				this.form.cityId = obj.cityId
+				this.form.area = obj.area
+				this.form.areaId = obj.areaId
+				this.form.cityShow = obj.cityShow
+				this.areaShow = false
+			},
+			//提交
+			saveCreator() {
+				if(this.loading) return
+				this.loading = true
+				let _this = this
+				if (!_this.form.name) {
+					this.loading = false
+					uni.$u.toast('请输入姓名');
+					return
+				}
+				if (!_this.form.phone) {
+					this.loading = false
+					uni.$u.toast('请输入手机号码');
+					return
+				}
+				const rule = /^[1][0-9][0-9]{9}$/
+				if (!rule.test(_this.form.phone)) {
+					this.loading = false
+					uni.$u.toast('请输入正确的手机号');
+					return
+				}
+				$http.post('/api/v1/mp/admin/channel/apply/submit', this.form).then(res => {
+					if (res.code == 0) {
+						uni.$u.toast('提交成功');
+						setTimeout(() => {
+							this.loading = false
+							uni.navigateBack({
+								delta: 1
+							})
+						}, 1000)
+					}else {
+						this.loading = false
+					}
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.creator {
+		background-color: #FFFFFF;
+		padding: 10rpx 40rpx 0rpx;
+	}
+
+	.save-btn {
+		margin-top: 20rpx;
+		padding: 50rpx 20rpx;
+
+		::v-deep button {
+			line-height: 76rpx;
+			font-size: 28rpx;
+			height: 76rpx;
+			color: #fff;
+			background-color: $uni-bg-color;
+			border: none;
+			border-radius: 100rpx;
+		}
+	}
+	
+	.tip {
+		padding: 40rpx 40rpx 0;
+		line-height: 46rpx;
+		font-size: 26rpx;
+		color: #999;
+		
+		&-phone {
+			text-align: center;
+			margin-top: 60rpx;
+			image {
+				width: 40rpx;
+				height: 40rpx;
+				vertical-align: top;
+				margin-top: 4rpx;
+			}
+			view {
+				display: inline-block;
+				margin-left: 10rpx;
+				
+			}
+		}
+		
+	}
+</style>

src/packagePrize/choice/index.vue

@@ -161,7 +161,7 @@
 						fontSize: 26, //字体大小
 						color: "#fff", //颜色
 						lineHeight: 44, //行高#4F4F4F 100%
-						mt: 220, //margin-top
+						mt: 90, //margin-top
 						w: 310,
 						align: "left"
 					},
@@ -179,7 +179,7 @@
 						w: 60, //宽度
 						h: 60, //高度
 						r: 2, //圆角半径
-						mt: 380
+						mt: 475
 					},
 					tips: [
 						
@@ -475,7 +475,7 @@
 
 		// 标题
 		&-title {
-			padding-top: 15vh;
+			padding-top: 12vh;
 			margin-bottom: 72rpx;
 
 			image {

src/packagePrize/coupon/use.vue

@@ -9,7 +9,7 @@
 		<!-- 优惠券筛选 -->
 		<view class="prize-state">
 			<u-tabs @change="changeTab" :scrollable="false" :list="stateArr" lineWidth="20" lineHeight="4"
-				lineColor="#E96737" :activeStyle="{
+				lineColor="#F9822C" :activeStyle="{
 									color: '#333',
 									transform: 'scale(1.1)',
 									width: '50px',

src/pages.json

@@ -156,6 +156,9 @@
 				},
 				{
 					"path": "activity/wxofficial"
+				},
+				{
+					"path": "creator/index"
 				}
 			]
 		},

src/pages/activity/index.vue

@@ -5,8 +5,8 @@
 		</u-navbar>
 		<view class="status">
 			<u-tabs @change="changeTab" :scrollable="false" :list="statusArr" lineWidth="30" lineHeight="3"
-				lineColor="#E96737" :activeStyle="{
-									color: '#E96737',
+				lineColor="#F9822C" :activeStyle="{
+									color: '#F9822C',
 									transform: 'scale(1)',
 									width: '150rpx',
 									

src/pages/index/index.vue

@@ -320,9 +320,9 @@
 				}
 			},
 			
-			toLucky() {
+			toLucky() {
 				uni.navigateTo({
-					url: `/pages/lucky/index?id=TXH00252-0001-0000006`
+					url: `/pages/lucky/index?id=TXH00252-0001-0000085`
 				})
 			},
 

src/pages/login/index.vue

@@ -32,7 +32,7 @@
 			<view class="flex about">
 				<view class="checked">
 					<u-checkbox-group>
-						<u-checkbox :value="checked" :checked="checked" size="20" shape="circle" activeColor="#E96737"
+						<u-checkbox :value="checked" :checked="checked" size="20" shape="circle" activeColor="#F9822C"
 							@change="changeChecked"></u-checkbox>
 					</u-checkbox-group>
 				</view>

src/pages/user/index.vue

@@ -63,6 +63,13 @@
 				</view>
 				<u-icon name="arrow-right" color="#666" size="16"></u-icon>
 			</view>
+			<view class="action-item flex" @click="toCreator">
+				<view class="action-item-left flex">
+					<image src="../../static/user/user_slice.png" mode="scaleToFill"></image>
+					<view class="title">申请创客</view>
+				</view>
+				<u-icon name="arrow-right" color="#666" size="16"></u-icon>
+			</view>
 			<!-- #ifdef MP-WEIXIN -->
 			<view class="action-item flex" @click="contactService">
 				<view class="action-item-left flex">
@@ -185,6 +192,17 @@
 				})
 			},
 			
+			//申请创客
+			toCreator() {
+				if (!this.loginState) {
+					uni.$u.toast('请登录');
+					return
+				}
+				uni.navigateTo({
+					url: '/packageOperate/creator/index'
+				})
+			},
+			
 			// 关于我们
 			toAbout() {
 				uni.navigateTo({

src/uni.scss

@@ -13,7 +13,7 @@
  */
 
 /* 颜色变量 */
-$uni-btn-color: #E96737;
+$uni-btn-color: #F9822C;
 
 /* 行为相关颜色 */
 $uni-color-primary: #007aff;
@@ -22,14 +22,14 @@ $uni-color-warning: #f0ad4e;
 $uni-color-error: #dd524d;
 
 /* 文字基本颜色 */
-$uni-text-color:#E96737;//基本色
+$uni-text-color:#F9822C;//基本色
 $uni-text-color-inverse:#fff;//反色
 $uni-text-color-grey:#999;//辅助灰色，如加载更多的提示信息
 $uni-text-color-placeholder: #808080;
 $uni-text-color-disable:#c0c0c0;
 
 /* 背景颜色 */
-$uni-bg-color:#E96737;
+$uni-bg-color:#F9822C;
 $uni-bg-color-grey:#f8f8f8;
 $uni-bg-color-hover:#f1f1f1;//点击状态颜色
 $uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色