linwu 2 сар өмнө
parent
commit
51e9cb0974

+ 2 - 2
main.js

@@ -22,8 +22,8 @@ app.$mount();
 import {
 	req
 } from '@/common/request/request.js';
-let baseUrl = 'http://bd.odd_job.com/';
-// let baseUrl = 'https://linggong.jinjianghc.com/';
+// let baseUrl = 'http://bd.odd_job.com/';
+let baseUrl = 'https://linggong.jinjianghc.com/';
 // let baseUrl = 'https://linggong.jiangzi.xin/';
 req.baseuUrl = baseUrl + 'mainapp.php/';
 

+ 15 - 0
pages.json

@@ -716,6 +716,21 @@
 			"style": {
 				"navigationBarTitleText": "我的邀请"
 			}
+		},
+		
+		//省外活动
+		{
+			"path": "pages/outactivity/index",
+			"style": {
+				"navigationBarTitleText": "省外活动"
+			}
+		},{
+			"path": "pages/outactivity/resumelist",
+			"style": {
+				"navigationBarTitleText": "招聘信息",
+				"enablePullDownRefresh": true,
+				"onReachBottomDistance": 50
+			}
 		}
 	],
 	"condition": { //模式配置,仅开发期间生效

+ 29 - 1
pages/broker/center.vue

@@ -49,6 +49,11 @@
 			</view>
 		</view>
 		<view class="cu-list grid col-3 no-border margin-top">
+			<view class="cu-item text-center" @click="showAgent">
+				<image class="myicon" :src="$getImageUrl('static/images/applet/broker/agent.png')"
+					style="width: 50rpx;height: 50rpx;"></image>
+				<text>门店信息</text>
+			</view>
 			<view class="cu-item text-center" @click="goNavPage('/pages/broker/broker')">
 				<image class="myicon" :src="$getImageUrl('static/images/applet/broker/code.png')"
 					style="width: 50rpx;height: 50rpx;"></image>
@@ -66,6 +71,22 @@
 				<text>悬赏报备记录</text>
 			</view>
 		</view>
+		
+		<view class="cu-modal" :class="modalName=='agentModal'?'show':''">
+		  <view class="cu-dialog">
+		    <view class="cu-bar bg-white justify-end">
+		      <view class="content">我的门店</view>
+		      <view class="action" @tap="hideModal">
+		        <text class="cuIcon-close text-red"></text>
+		      </view>
+		    </view>
+		    <view class="padding-xl text-left text-lg">
+				<view>门店名:{{statistics.agent.title}}</view>
+				<view class="margin-top-sm">联系人:{{statistics.agent.realname}}</view>
+				<view class="margin-top-sm">电话:{{statistics.agent.mobile}}</view>
+		    </view>
+		  </view>
+		</view>
 	</view>
 </template>
 
@@ -81,14 +102,15 @@
 					income: 0,
 					user: 0,
 					worker: 0,
+					agent: {},
 				},
+				modalName: '',
 			};
 		},
 		onLoad: function() {
 			_this = this;
 			_this.userinfo = uni.getStorageSync('userinfo') || false;
 			_this.brokerinfo = uni.getStorageSync('brokerinfo') || false;
-			console.log("经纪人", _this.brokerinfo)
 			if (_this.userinfo === false || _this.brokerinfo === false) {
 				uni.reLaunch({
 					url: "/pages/my/my"
@@ -134,6 +156,12 @@
 					}
 				});
 			},
+			hideModal: function(e) {
+				_this.modalName = null;
+			},
+			showAgent: function() {
+				_this.modalName = "agentModal";
+			},
 		},
 		computed: {
 			income_title() {

+ 1 - 0
pages/login/login.vue

@@ -134,6 +134,7 @@
 				weixinInfo: {
 					parentid: 0,
 					openid: "",
+					unionid: "",
 					nickname: "",
 					avatar: "",
 					editmobile: "",

+ 22 - 2
pages/my/my.vue

@@ -27,7 +27,7 @@
 								</view>
 								<text class="infor-top-noVerify" v-if="userinfo.authstatus == 1">(未实名)</text>
 							</view>
-							<view class="infor-bottom">{{userinfo.mobile}}</view>
+							<view class="infor-bottom">{{userinfo.mobile}}<text class="margin-left" v-if="upper" @click="myUpper">(我的上级)</text></view>
 						</view>
 					</view>
 				</view>
@@ -354,6 +354,21 @@
 				</view>
 			</view>
 		</view>
+		
+		<view class="cu-modal" :class="modalName=='upperModal'?'show':''">
+		  <view class="cu-dialog">
+		    <view class="cu-bar bg-white justify-end">
+		      <view class="content">我的上级</view>
+		      <view class="action" @tap="hideModal">
+		        <text class="cuIcon-close text-red"></text>
+		      </view>
+		    </view>
+		    <view class="padding-xl text-left text-lg">
+				<view>姓名:{{upper.title}}</view>
+				<view class="margin-top-sm">电话:{{upper.mobile}}</view>
+		    </view>
+		  </view>
+		</view>
 
 
 
@@ -414,6 +429,7 @@
 				workerall: null,
 				agentall: null,
 				brokerall: null,
+				upper: null,
 				modalName: null,
 				resident: null,
 				tip_num: {
@@ -460,7 +476,7 @@
 					_this.agentall = data.agentall;
 					_this.brokerall = data.brokerall;
 					_this.resident = data.resident;
-					console.log("经纪人",_this.brokerall)
+					_this.upper = data.upper;
 					uni.setStorageSync('residentinfo', data.resident);
 					uni.setStorageSync('brokerinfo', data.brokerall ? data.brokerall[0] : null);
 				}).catch((err) => {
@@ -668,6 +684,10 @@
 				// 	url: "/pages/index/home"
 				// });
 			},
+			
+			myUpper: function() {
+				_this.modalName = "upperModal";
+			},
 
 		}
 	}

+ 4 - 4
pages/my/myinfo.vue

@@ -251,7 +251,7 @@
 		</form>
 
 
-		<view class="cu-modal" :class="forminfo.isshow">
+		<view class="cu-modal show" v-show="forminfo.isshow == 'show'">
 			<view class="cu-dialog">
 				<view class="cu-bar bg-white justify-end">
 					<view class="content">修改 {{forminfo.title}}</view>
@@ -260,9 +260,9 @@
 					</view>
 				</view>
 				<view class="padding-xl bg-white text-left solid-top solid-bottom">
-					<input v-if="forminfo.infobox=='input'" :placeholder="'请输入'+forminfo.title+'...'" @input="bindInput"
+					<input v-if="forminfo.infobox=='input'" type="text" :placeholder="'请输入'+forminfo.title+'...'" @input="bindInput"
 						:value="forminfo.value"></input>
-					<textarea v-if="forminfo.infobox=='textarea'" :placeholder="'请输入'+forminfo.title+'...'"
+					<textarea v-if="forminfo.infobox=='textarea'" type="textarea" :placeholder="'请输入'+forminfo.title+'...'"
 						@input="bindInput" maxlength="-1" :value="forminfo.value"></textarea>
 				</view>
 				<view class="cu-bar bg-white justify-end">
@@ -274,7 +274,7 @@
 			</view>
 		</view>
 
-		<view class="cu-modal" :class="formavatar">
+		<view class="cu-modal show" v-show="formavatar == 'show'">
 			<view class="cu-dialog">
 				<view class="cu-bar bg-white justify-end">
 					<view class="content">修改 昵称</view>

+ 1 - 1
pages/worker/worker.vue

@@ -167,7 +167,7 @@
 					<text>工厂招聘</text>
 				</view>
 				-->
-				<view class="cu-item" data-pageurl="/pages/worker/outjoblist" @tap="goPage">
+				<view class="cu-item" data-pageurl="/pages/worker/outjoblist" @tap="goPage" v-if="workerinfo.wtype==2">
 					<image :src="$getImageUrl('static/images/applet/worker/workernav1.png')" mode="scaleToFill"></image>
 					<text>省外招聘</text>
 				</view>