update

commonFun.js

@@ -12,14 +12,24 @@ import commonData from './commonData.js'
 // 请求webviewURL路径
 //const webviewServerUrlReq = 'https://admin.kuailaiyou.top/';
 
+
+// 静态图片路径
+const serverUrl = 'https://app.tjzhxx.cn:4100/prjcenter/prjKLY/fileroot/images/front/';
+// 请求URL路径
+const serverUrlReq = 'https://app.tjzhxx.cn:4100/';
+// 请求webviewURL路径
+const webviewServerUrlReq = 'https://app.tjzhxx.cn:4101/';
+
+
+
 /*本地测试*/
 
 // 静态图片路径
-const serverUrl = 'http://api.bizdbKLY.com/prjcenter/prjKLY/fileroot/images/front/';
+//const serverUrl = 'http://api.bizdbKLY.com/prjcenter/prjKLY/fileroot/images/front/';
 // 请求URL路径
-const serverUrlReq = 'http://api.bizdbKLY.com/';
+//const serverUrlReq = 'http://api.bizdbKLY.com/';
 // 请求webviewURL路径
-const webviewServerUrlReq = 'http://admin.bizdbKLY.com/';
+//const webviewServerUrlReq = 'http://admin.bizdbKLY.com/';
 
 
 // request数据

manifest.json

@@ -49,22 +49,23 @@
     /* 快应用特有相关 */
     "mp-weixin" : {
         /* 小程序特有相关 */
-        "appid" : "wx8c230ea00ceb8676",
+        "appid" : "wxcd35a60de7b5942a",
         "setting" : {
             "urlCheck" : false,
-            "minified" : false,
-            "postcss" : true,
+            "minified" : true,
+            "postcss" : false,
             "es6" : false
         },
         "usingComponents" : true,
         "permission" : {
             "scope.userLocation" : {
-                "desc" : "需要获取您的位置"
+                "desc" : "确定业务发生的位置"
             }
         },
         "requiredPrivateInfos" : [
-            "getFuzzyLocation",
+            //"getFuzzyLocation",
             "getLocation",
+            "chooseLocation",
             "onLocationChange",
             "startLocationUpdateBackground",
             "chooseAddress"

pages/merchant/index.vue

@@ -93,12 +93,20 @@
 
 					<navigator v-if="tab_status!=2" :url="'./memberList?id='+item.id">
 						<view style="display: flex;align-items: center;">
-							<view style="margin-right: 15upx;color: #01bcc3;">
+							<!--<view style="margin-right: 15upx;color: #01bcc3;">
 								{{item.enrolled_heads.length>0?'已报名人员':'查看全部'}}
 							</view>
 							<view class="has_signed">
 								<image :key="index" v-for="(item2,index) in item.enrolled_heads"
 									:src="serverUrl+'touxiang/'+item2+'.png'"></image>
+							</view>-->
+							
+							<view style="margin-right: 15upx;color: #01bcc3;">
+								{{item.todo_list.length>0?'已报名人员':'查看全部'}}
+							</view>
+							<view class="has_signed" v-if="item.todo_list.length>0">
+								<image :key="index" v-for="(item2,index) in item.todo_list"
+									:src="item2.profile_photo"></image>
 							</view>
 						</view>
 					</navigator>

pages/merchant/memberList.vue

@@ -94,8 +94,13 @@
 
 						<view style="color: #8D8D8D;margin-top: 5upx;">
 							报名时间：{{item.createtime}}</view>
-						<view style="color: #8D8D8D;margin-top: 5upx;" v-if="item.plan_dotime">
-							上班日期：{{item.plan_dotime}}</view>
+						<view style="color: #8D8D8D;margin-top: 5upx;" v-if="item.plan_dotime&&item.urgent_level==1">
+							<view>上班日期：{{item.plan_dotime}}  {{item.begin_hour}}~{{item.finish_hour}}</view>
+						</view>
+						<view style="color: #8D8D8D;margin-top: 5upx;" v-if="item.plan_dotime&&item.urgent_level==0">
+							<view>上班日期：{{item.plan_dotime}}</view>
+							<view>开始结束时间：{{item.btr_begindatetime1}}~{{item.btr_finishdatetime1}} {{item.begin_hour}}~{{item.finish_hour}}</view>
+						</view>
 						<view>
 							<view style="color: #8D8D8D;margin-top: 5upx;" v-if="item.worked_begintime">
 								开始工作时间：{{item.worked_begintime}}</view>

pages/order/detail.vue

@@ -36,9 +36,10 @@
 					</view>
 					<view style="display: flex;align-items: center;">
 						<view class="has_signed">
-							<image :key="index"
+							<!--<image :key="index"
 								v-for="(item,index) in formate_enrolled_heads(data.enrolled_heads, (Number(data.now_worker_total000)))"
-								:src="serverUrl+'touxiang/'+item+'.png'"></image>
+								:src="serverUrl+'touxiang/'+item+'.png'"></image>-->
+							<image :key="index" v-for="(item,index) in data.todo_list" :src="item.profile_photo" mode=""></image>
 						</view>
 						<text>{{data.now_worker_total000==0?'':(data.now_worker_total000+'人已报名')}}</text>
 					</view>
@@ -230,6 +231,34 @@
 				</view>
 			</view>
 		</uni-popup>
+		<!--<uni-popup ref="popup_sign" :mask-click="false">
+			<view class="modal_box">
+				<view style="color: #313131;text-align: center;font-size: 38upx;line-height: 90upx;">注意事项</view>
+				<view class="mention">
+					<view>1、每个工作报名都会收取押金，若同一时间段报名多个工作，若一商家录取则其他同一时间段报名被动取消，押金一并返还。</view>
+					<view>2、未录取前取消工作或未录取工作，押金自然返还。</view>
+					<view>3、录取之后完成工作，押金会和工资同时返还。</view>
+					<view>4、取之后，若商家违约取消工作，补偿金会和押金自然返还。</view>
+					<view>5、仅限因个人原因未到协定岗位者，押金扣除补偿给商家。</view>
+					<view>
+						<navigator v-if="!user_info.true_name" url="/pages/personal/authentication">
+							6、实名认证后免费赠送最高10万元的人身意外险，点击去认证。
+						</navigator>
+					</view>
+					<view style="color: #01bcc3;font-weight: bold;align-items: center;">
+						本次报名需支付{{data['base_config']['value']}}元押金
+						<image src="../../static/ques.png" @click="show_yajin_info()"
+							style="margin-left: 10upx;width: 35upx;height: 35upx;"></image>
+					</view>
+				</view>
+				<view class="modal_btn">
+					<view @click="close_sign_modal" class="modal_btn_cancel">取消</view>
+					<view v-if="data.settle_catalog==1" @click="sign" class="modal_btn_confirm">
+						选择报名日期</view>
+					<view @click="sign" class="modal_btn_confirm" v-else>确认报名</view>
+				</view>
+			</view>
+		</uni-popup>-->
 
 		<!-- 取消报名遮罩 -->
 		<uni-popup ref="popup_cancel_sign" :mask-click="false">
@@ -244,7 +273,7 @@
 		</uni-popup>
 
 		<!-- 押金说明遮罩 -->
-		<uni-popup ref="popup_yajin" :mask-click="false">
+		<!--<uni-popup ref="popup_yajin" :mask-click="false">
 			<view class="modal_box">
 				<view style="color: #313131;text-align: center;font-size: 38upx;line-height: 90upx;">押金支付说明</view>
 				<view class="mention">
@@ -258,6 +287,36 @@
 					<view style="margin: 0 auto;" @click="close_yajin_info" class="modal_btn_confirm">我知道了</view>
 				</view>
 			</view>
+		</uni-popup>-->
+		<uni-popup ref="popup_yajin" :mask-click="false" v-if="1==data.urgent_level">
+			<view class="modal_box">
+				<view style="color: #313131;text-align: center;font-size: 38upx;line-height: 90upx;">押金支付说明</view>
+				<view class="mention">
+					<view>1、每个工作报名都会收取押金，可以接多个工作。</view>
+					<view>2、未录取前取消工作或未录取工作，押金自然返还。</view>
+					<view>3、录取之后完成工作，押金会和工资同时返还。</view>
+					<view>4、录取之后，若商家违约取消工作，补偿金会和押金自然返还。</view>
+					<view>5、仅限因个人原因未到协定岗位者，或未完成工作押金扣除补偿给商家。</view>
+				</view>
+				<view class="modal_btn">
+					<view style="margin: 0 auto;" @click="close_yajin_info" class="modal_btn_confirm">我知道了</view>
+				</view>
+			</view>
+		</uni-popup>
+		<uni-popup ref="popup_yajin" :mask-click="false" v-else>
+			<view class="modal_box">
+				<view style="color: #313131;text-align: center;font-size: 38upx;line-height: 90upx;">押金支付说明</view>
+				<view class="mention">
+					<view>1、每个工作报名都会收取押金，若同一时间段报名多个工作，若一商家录取则其他同一时间段报名被动取消，押金一并返还。</view>
+					<view>2、未录取前取消工作或未录取工作，押金自然返还。</view>
+					<view>3、录取之后完成工作，押金会和工资同时返还。</view>
+					<view>4、录取之后，若商家违约取消工作，补偿金会和押金自然返还。</view>
+					<view>5、仅限因个人原因未到协定岗位者，或未完成工作押金扣除补偿给商家。</view>
+				</view>
+				<view class="modal_btn">
+					<view style="margin: 0 auto;" @click="close_yajin_info" class="modal_btn_confirm">我知道了</view>
+				</view>
+			</view>
 		</uni-popup>
 
 		<!-- 日期选择遮罩 -->

pages/order/indexItem.vue

@@ -59,9 +59,10 @@
 						{{data.now_worker_total000>0?(data.now_worker_total000+'人已报名'):''}}
 					</view>
 					<view class="has_signed">
-						<image :key="index"
+						<!--<image :key="index"
 							v-for="(item,index) in formate_enrolled_heads(data.enrolled_heads, (Number(data.now_worker_total000)))"
-							:src="serverUrl+'touxiang/'+item+'.png'"></image>
+							:src="serverUrl+'touxiang/'+item+'.png'"></image>-->
+						<image :key="index" v-for="(item,index) in data.todo_list" :src="item.profile_photo" mode=""></image>
 					</view>
 				</view>
 			</view>
@@ -107,6 +108,7 @@
 
 		created() {
 			this.data = this.dataSource || {};
+			console.log(this.data)
 			this.indexItem = this.index
 		}
 	}

pages/personal/makeMoneyDetail.vue

@@ -9,7 +9,14 @@
 					<navigator :url="'../order/detail?id='+item.btr_id">{{item.btr_title}}</navigator>
 				</view>
 				<view>订单编号：{{item.tdwk_sn}}</view>
-				<view>会员名：{{item.true_name}}</view>
+				<view class="" style="display: flex;align-items: center;">
+					<view class="" style="width: 100upx;">
+						<image style="width: 100upx;height: 100upx;border-radius: 50%;" :src="item.profile_photo||'../../static/user.png'"></image>
+					</view>
+					<view class="">
+						{{item.true_name}}
+					</view>
+				</view>
 				<view>佣金：<text style="color: #f9663b;font-weight: bold;">{{item.money_total}}元</text></view>
 				<view>订单时间：{{item.bwa_createtime}}</view>
 			</view>