update 种草和带货任务详情中申请按钮样式优化

App.vue

@@ -3,6 +3,8 @@
 		globalData: {
 			navHeight: "",
 			picture: {
+				icon_copy2: "https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/copy.svg",
+				icon_share2: "https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/share.svg",
 				icon_dianfuchunyong: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/dianfu_chunyong.png',
 				icon_dianfuxuanshang: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/dianfu_xuanshang.png',
 				icon_mainfeichunyong: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/mianfeilingyang_chunyongdaihuo.png',

components/request.js

@@ -2,8 +2,8 @@
 
 export default {
 	config: {
-		// baseUrl: "http://localhost:8200",	//本地开发
-		baseUrl: "https://talent.younggee.com:8201", //默认的公共域名
+		baseUrl: "http://localhost:8200",	//本地开发
+		// baseUrl: "https://talent.younggee.com:8201", //默认的公共域名
 		// baseUrl: "https://139.9.53.143:8201",  //默认的公共域名
 	},
 

components/requesttoken111.js

@@ -2,8 +2,8 @@
 //通用uni-app网络请求
 export default {
 	config: {
-		// baseUrl: "http://localhost:8200", //本地开发
-		baseUrl: "https://talent.younggee.com:8201", //默认的公共域名
+		baseUrl: "http://localhost:8200", //本地开发
+		// baseUrl: "https://talent.younggee.com:8201", //默认的公共域名
 		// baseUrl: "https://139.9.53.143:8201",  //默认的公共域名
 
 		header: {

page_selectionsquare/selectiondetail/selectiondetail.vue

@@ -202,17 +202,31 @@
 
 			<view class="interval2"></view>
 			<view class="signup">
-				<button type="default" class="but1" v-if="!isSign && !ddl" @click="submit()">立即申请</button>
-				<button type="default" class="but1" disabled v-if="isSign && !ddl"> 已报名 </button>
-				<button type="default" class="but1" disabled v-if="ddl"> 报名结束 </button>
+				<view style="display: flex;justify-content: space-between;align-items: center;">
+					<view style="display: flex;flex-direction: column;justify-content: center;align-items: center;margin: 0 20rpx;"
+						@click="toggle1('bottom')">
+						<image style="width: 50rpx;height: 50rpx;" :src="picture.icon_share2"></image>
+						<p style="font-size: 28rpx;">分享</p>
+					</view>
+					<view style="display: flex;flex-direction: column;justify-content: center;align-items: center;margin: 0 20rpx;"
+						@click="handleCopy(selection.product_url)">
+						<image style="width: 50rpx;height: 50rpx;" :src="picture.icon_copy2"></image>
+						<p style="font-size: 28rpx;">带货链接</p>
+					</view>
+				</view>
+				<view>
+					<button type="default" class="but1" v-if="!isSign && !ddl" @click="submit()">立即申请</button>
+					<button type="default" class="but1" disabled v-if="isSign && !ddl">已报名</button>
+					<button type="default" class="but1" disabled v-if="ddl">报名结束</button>
+				</view>
 
-				<button type="default" class="but2" @click="handleCopy(selection.product_url)">
+				<!-- <button type="default" class="but2" @click="handleCopy(selection.product_url)">
 					复制带货链接
 				</button>
 				<button type="default" class="but2" @click="toggle1('bottom')">
-					<!-- <image src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/task8.png" mode=""></image> -->
 					分享
-				</button>
+				</button> -->
+				<!-- <image src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/task8.png" mode=""></image> -->
 			</view>
 
 			<view>
@@ -1622,7 +1636,7 @@
 	}
 
 	.but1 {
-		// width: 60%;
+		width: 400rpx;
 		background-color: #f2d22d;
 		border-radius: 20rpx;
 		font-size: 36rpx;
@@ -1658,11 +1672,11 @@
 
 	/** 必须提升样式优先权(!important) **/
 	button[disabled] {
-		width: 60%;
+		// width: 60%;
 		border-radius: 20rpx;
 		font-size: 36rpx;
 		line-height: 200%;
-		letter-spacing: 10rpx;
+		// letter-spacing: 10rpx;
 		font-weight: 500;
 		height: 80%;
 		color: white !important;
@@ -1695,11 +1709,13 @@
 		box-shadow: 0rpx 5rpx 40rpx #ccc;
 		width: 100%;
 		position: fixed;
-		bottom: 0rpx;
-		display: flex;
 		height: 90rpx;
 		padding: 2% 0;
 		background-color: #FFFFFF;
+		bottom: 0rpx;
+		display: flex;
+		justify-content: space-around;
+		align-items: center;
 	}
 
 	.pick {

page_tasksquare/wholetask/taskdetail.vue

@@ -155,142 +155,160 @@
 					</view>
 				</view>
 			</view>
-		<view class="interval2"></view>
-	</view>
+			<view class="interval2"></view>
+		</view>
 
-	<view class="signup" v-if="!loading">
-		<button type="default" class="but1" :loading="loading" :class="{'on':item.title === '1',}"
-			@click="toggle('bottom')" v-if="isSign===0 && ddl === 0">
-			立即报名</button>
-		<button type="default" class="but1" disabled v-if="isSign===1 && ddl === 0"> 已报名 </button>
-		<button type="default" class="but1" disabled v-if="ddl===1"> 报名结束 </button>
-		<button type="default" class="but2" @click="toggle1('bottom')">
+		<view class="signup" v-if="!loading">
+			<view style="display: flex;justify-content: space-between;align-items: center;">
+				<view
+					style="display: flex;flex-direction: column;justify-content: center;align-items: center;margin: 0 20rpx;"
+					@click="toggle1('bottom')">
+					<image style="width: 50rpx;height: 50rpx;" :src="picture.icon_share2"></image>
+					<p style="font-size: 28rpx;">分享</p>
+				</view>
+				<view
+					style="display: flex;flex-direction: column;justify-content: center;align-items: center;margin: 0 20rpx;"
+					@click="handleCopy(information.Product.ProductUrl)">
+					<image style="width: 50rpx;height: 50rpx;" :src="picture.icon_copy2"></image>
+					<p style="font-size: 28rpx;">带货链接</p>
+				</view>
+			</view>
+			<view>
+				<button type="default" class="but1" :loading="loading" :class="{'on':item.title === '1',}"
+					@click="toggle('bottom')" v-if="isSign===0 && ddl === 0">
+					立即报名</button>
+				<button type="default" class="but1" disabled v-if="isSign===1 && ddl === 0"> 已报名 </button>
+				<button type="default" class="but1" disabled v-if="ddl===1"> 报名结束 </button>
+			</view>
+			<!-- 		<button type="default" class="but2" @click="toggle1('bottom')">
 			<image src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/task8.png" mode=""></image>
 			分享
-		</button>
-	</view>
-	<view>
-		<!-- 底部普通弹窗 -->
-		<uni-popup ref="popup" background-color="#fff" @change="change" style="border-radius: 20rpx;">
-			<view class="popup-content" :class="{ 'popup-height': type === 'left' || type === 'right' }">
-				<view class="">
-					<view class="sampledrawing">
-						<image :src="img" style="width: 250rpx;height: 235rpx;margin-top: -9%;margin-left: -3%;"
-							mode="">
-						</image>
-						<view class="samplecharacter">
-							<p>{{information.project_name}}</p>
-						</view>
-					</view>
-					<!-- 商品价值及任务形式 -->
-					<view
-						style="display: flex;align-items: center;justify-content: space-between;margin-bottom: 50rpx;">
-						<view style="font-size: 32rpx;">
-							<p>商品价值：{{information.Product.ProductPrice}}元</p>
+		</button> -->
+		</view>
+		<view>
+			<!-- 底部普通弹窗 -->
+			<uni-popup ref="popup" background-color="#fff" @change="change" style="border-radius: 20rpx;">
+				<view class="popup-content" :class="{ 'popup-height': type === 'left' || type === 'right' }">
+					<view class="">
+						<view class="sampledrawing">
+							<image :src="img" style="width: 250rpx;height: 235rpx;margin-top: -9%;margin-left: -3%;"
+								mode="">
+							</image>
+							<view class="samplecharacter">
+								<p>{{information.project_name}}</p>
+							</view>
 						</view>
-						<view style="margin-right: 20rpx;font-size: 32rpx;">
-							<p>任务形式：{{information.project_form}}</p>
+						<!-- 商品价值及任务形式 -->
+						<view
+							style="display: flex;align-items: center;justify-content: space-between;margin-bottom: 50rpx;">
+							<view style="font-size: 32rpx;">
+								<p>商品价值：{{information.Product.ProductPrice}}元</p>
+							</view>
+							<view style="margin-right: 20rpx;font-size: 32rpx;">
+								<p>任务形式：{{information.project_form}}</p>
+							</view>
 						</view>
-					</view>
-					<view class="">
-						<!-- <h3>产品规格</h3> -->
 						<view class="">
-							<uni-data-checkbox mode="tag" v-model="value" :localdata="sex">
-							</uni-data-checkbox>
+							<!-- <h3>产品规格</h3> -->
+							<view class="">
+								<uni-data-checkbox mode="tag" v-model="value" :localdata="sex">
+								</uni-data-checkbox>
+							</view>
 						</view>
-					</view>
-					<view class="" style=";margin-bottom: 50rpx; ">
-						<p style="font-size: 32rpx;">合作选择（平台账号不达标不能选择）</p>
-						<view class="tip_box" style="margin-top: 0;" v-if="showWarning">
-							<view class="container"
-								style="margin-right: 300rpx;background-color: #f24632;border-radius: 10rpx">
-								<view class="tips">
-									<p style="font-size: 24rpx;color: #fff">请选择合作方式</p>
+						<view class="" style=";margin-bottom: 50rpx; ">
+							<p style="font-size: 32rpx;">合作选择（平台账号不达标不能选择）</p>
+							<view class="tip_box" style="margin-top: 0;" v-if="showWarning">
+								<view class="container"
+									style="margin-right: 300rpx;background-color: #f24632;border-radius: 10rpx">
+									<view class="tips">
+										<p style="font-size: 24rpx;color: #fff">请选择合作方式</p>
+									</view>
 								</view>
 							</view>
-						</view>
-						<view id="coop_box" v-if="hackReset">
-							<view v-for="item in coop_choice" :key="item.strategy_id">
-								<view class="coop_box_btn" :class="strategy_id===item.strategy_id?'borderColor':''"
-									@click="handleCoopClick(item)">
-									<p>粉丝量：{{item.show_followers_low}}-{{item.show_followers_up}}</p>
-									<view style="display: flex;align-items: center;justify-content: center;">
-										<p>稿费：{{item.fee_form_t}}</p>
-										<view v-if="item.fee_form===3">
-											<input class="offer_input" type="number" placeholder="请输入"
-												v-model="item.offer" />
-										</view>
-										<view v-if="item.fee_form===3">
-											<p>元</p>
+							<view id="coop_box" v-if="hackReset">
+								<view v-for="item in coop_choice" :key="item.strategy_id">
+									<view class="coop_box_btn" :class="strategy_id===item.strategy_id?'borderColor':''"
+										@click="handleCoopClick(item)">
+										<p>粉丝量：{{item.show_followers_low}}-{{item.show_followers_up}}</p>
+										<view style="display: flex;align-items: center;justify-content: center;">
+											<p>稿费：{{item.fee_form_t}}</p>
+											<view v-if="item.fee_form===3">
+												<input class="offer_input" type="number" placeholder="请输入"
+													v-model="item.offer" />
+											</view>
+											<view v-if="item.fee_form===3">
+												<p>元</p>
+											</view>
 										</view>
 									</view>
-								</view>
 
-								<view class="tip_box" v-if="item.showWarning">
-									<view class="container"
-										style="margin-right: 200rpx;background-color: #f24632;border-radius: 10rpx">
-										<view class="tips">
-											<p style="font-size: 24rpx;color: #fff">
-												{{item.warningText}}
-											</p>
+									<view class="tip_box" v-if="item.showWarning">
+										<view class="container"
+											style="margin-right: 200rpx;background-color: #f24632;border-radius: 10rpx">
+											<view class="tips">
+												<p style="font-size: 24rpx;color: #fff">
+													{{item.warningText}}
+												</p>
+											</view>
 										</view>
 									</view>
 								</view>
 							</view>
 						</view>
-					</view>
-					<view class="butto">
-						<button class="mini-btn1" size="mini" @tap="Reset"
-							style="background-color: #FFFFFF;margin-right: 50rpx;">更新账号信息</button>
-						<button class="mini-btn2" size="mini" @tap="determine"
-							style="background-color: #f2d22d;">立即报名</button>
+						<view class="butto">
+							<button class="mini-btn1" size="mini" @tap="Reset"
+								style="background-color: #FFFFFF;margin-right: 50rpx;">更新账号信息</button>
+							<button class="mini-btn2" size="mini" @tap="determine"
+								style="background-color: #f2d22d;">立即报名</button>
+						</view>
 					</view>
 				</view>
-			</view>
-		</uni-popup>
-	</view>
-	<view>
-		<!-- 底部普通弹窗 -->
-		<uni-popup ref="popup1" background-color="#fff" @change="change" style="border-radius: 20rpx;">
-			<view class="popup-content1" :class="{ 'popup-height': type === 'left' || type === 'right' }">
-				<view style="display: flex; justify-content: space-around; margin-top: 10% ;margin-bottom: 3% ;">
-					<view>
-						<button class="tii2" data-name="shareBtn" open-type="share">
-							<view class="circular" style="margin-top: 10% ;">
-								<image src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/taskw.png" mode="">
-								</image>
-							</view>
-							<p class="tii">发送给朋友</p>
-						</button>
-					</view>
-					<view>
-						<button class="tii2" @click="toggle2('center')">
-							<view class="circular" style="margin-top: 10% ;">
-								<image src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/taske.png" mode="">
-								</image>
-							</view>
-							<p class="tii">生成分享码</p>
-						</button>
+			</uni-popup>
+		</view>
+		<view>
+			<!-- 底部普通弹窗 -->
+			<uni-popup ref="popup1" background-color="#fff" @change="change" style="border-radius: 20rpx;">
+				<view class="popup-content1" :class="{ 'popup-height': type === 'left' || type === 'right' }">
+					<view style="display: flex; justify-content: space-around; margin-top: 10% ;margin-bottom: 3% ;">
+						<view>
+							<button class="tii2" data-name="shareBtn" open-type="share">
+								<view class="circular" style="margin-top: 10% ;">
+									<image src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/taskw.png"
+										mode="">
+									</image>
+								</view>
+								<p class="tii">发送给朋友</p>
+							</button>
+						</view>
+						<view>
+							<button class="tii2" @click="toggle2('center')">
+								<view class="circular" style="margin-top: 10% ;">
+									<image src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/taske.png"
+										mode="">
+									</image>
+								</view>
+								<p class="tii">生成分享码</p>
+							</button>
+						</view>
 					</view>
-				</view>
 
-				<button type="default" class="errar" @click="cancel()">取消</button>
-			</view>
-		</uni-popup>
-	</view>
+					<button type="default" class="errar" @click="cancel()">取消</button>
+				</view>
+			</uni-popup>
+		</view>
 
-	<uni-popup ref="popup2" class="share1" background-color="#fff" @change="change">
-		<view class="popup-content">
-			<image :src="canvasUrl" mode="widthFix" style="width: 300px;height: 420px;margin-top: 30rpx;">
-			</image>
-			<mosoweCanvas ref="mosoweCanvasComponents" @canvasImage="_canvasImage" :lists="lists" height="420"
-				width="300" imgType="png" />
+		<uni-popup ref="popup2" class="share1" background-color="#fff" @change="change">
+			<view class="popup-content">
+				<image :src="canvasUrl" mode="widthFix" style="width: 300px;height: 420px;margin-top: 30rpx;">
+				</image>
+				<mosoweCanvas ref="mosoweCanvasComponents" @canvasImage="_canvasImage" :lists="lists" height="420"
+					width="300" imgType="png" />
 
-			<view class="" style="text-align: center;margin: 5% 0;">
-				<button class="butmin" size="mini" @tap="saveImage">保存</button>
+				<view class="" style="text-align: center;margin: 5% 0;">
+					<button class="butmin" size="mini" @tap="saveImage">保存</button>
+				</view>
 			</view>
-		</view>
-	</uni-popup>
+		</uni-popup>
 	</view>
 	</view>
 </template>
@@ -694,6 +712,13 @@
 		},
 		methods: {
 			handleCopy(content) {
+				if (content === '') {
+					uni.showToast({
+						title: '商品链接为空',
+						icon: 'none'
+					});
+					return
+				}
 				wx.setClipboardData({
 					data: content,
 					success: function(res) {
@@ -806,7 +831,7 @@
 							}
 						}
 						this.hasNoProductPhoto = this.carouselImages.length === 0 ? true : false
-						
+
 						// 任务数量
 						this.information.taskNum = 0
 						for (let j = 0; j < this.information.RecruitStrategy.length; j++) {
@@ -1685,12 +1710,12 @@
 	}
 
 	.but1 {
-		width: 60%;
+		width: 400rpx;
 		background-color: #f2d22d;
 		border-radius: 20rpx;
 		font-size: 36rpx;
 		line-height: 200%;
-		letter-spacing: 10rpx;
+		// letter-spacing: 10rpx;
 		font-weight: 500;
 		height: 80%;
 
@@ -1703,11 +1728,11 @@
 
 	/** 必须提升样式优先权(!important) **/
 	button[disabled] {
-		width: 60%;
+		// width: 60%;
 		border-radius: 20rpx;
 		font-size: 36rpx;
 		line-height: 200%;
-		letter-spacing: 10rpx;
+		// letter-spacing: 10rpx;
 		font-weight: 500;
 		height: 80%;
 		color: white !important;
@@ -1736,15 +1761,18 @@
 		top: 21%;
 	}
 
+
 	.signup {
 		box-shadow: 0rpx 5rpx 40rpx #ccc;
 		width: 100%;
 		position: fixed;
-		bottom: 0rpx;
-		display: flex;
 		height: 90rpx;
 		padding: 2% 0;
 		background-color: #FFFFFF;
+		bottom: 0rpx;
+		display: flex;
+		justify-content: space-around;
+		align-items: center;
 	}
 
 	.pick {