同步

components/panel/fixed.vue

@@ -1,10 +1,22 @@
 <template>
-	<view class="g-components-panel-fixed">
+	<view class="g-components-panel-fixed" :style="{ backgroundColor }" :class="[border ? 'g_border_e_t' : '']">
 		<slot></slot>
 	</view>
 </template>
 
 <script>
+export default {
+	props: {
+		border: {
+			type: Boolean,
+			default: true,
+		},
+		backgroundColor: {
+			type: String,
+			default: "#fff",
+		},
+	},
+};
 </script>
 
 <style>
@@ -13,12 +25,10 @@
 	width: 100%;
 	bottom: 0;
 	left: 0;
-		background-color: #fff;
 	padding-top: 12px;
 	padding-bottom: calc(constant(safe-area-inset-bottom)); /*兼容 IOS<11.2*/
 	padding-bottom: calc(env(safe-area-inset-bottom)); /*兼容 IOS>11.2*/
 	min-height: 72px;
-		border-top: 1rpx solid #eee;
 	z-index: 999;
 	box-sizing: border-box;
 }

root/NEUIKit/pages/user-card/friend/index.vue

@@ -9,9 +9,9 @@
 					<switch :checked="isInBlacklist" @change="(checked) => handleSwitchChange(checked)" />
 				</div>
 				<div class="userInfo-item">
-					<div class="item-left">{{ "客服手机号" }}</div>
+					<div class="item-left">{{ "手机号" }}</div>
 					<div class="g_flex_row_end" @click="takeTel">
-						<div class="">{{ userInfo.tel || '-' }}</div>
+						<div class="">{{ tel || "-" }}</div>
 					</div>
 				</div>
 			</div>
@@ -93,6 +93,7 @@ import Icon from "../../../components/Icon.vue";
 import G from "../../../../../utils/ajax.js";
 
 const userInfo = ref<V2NIMUser>();
+const tel = ref();
 const relation = ref<Relation>("stranger");
 const isInBlacklist = ref(false);
 
@@ -122,12 +123,12 @@ onLoad((props) => {
 	console.log(G, "123131231231232");
 	G.Post("/wyyx/user/findUser", { accid: userInfo.value.accountId }, (res) => {
 		console.log("resresresresresres", res);
-		userInfo.value.tel = res.data.tel;
+		tel.value = res.data.tel;
 	});
 });
 function takeTel() {
 	uni.makePhoneCall({
-		phoneNumber: userInfo.value.tel,
+		phoneNumber: tel,
 	});
 }
 const handleSwitchChange = async (e: any) => {

root/detail/apply.vue

@@ -386,9 +386,9 @@
 				</view>
 			</slot>
 		</g-panel-fixed>
-		<u-popup v-model="shareModal.isShow" mode="bottom" border-radius="16" height="600px" :mask-close-able="true">
+		<!-- <u-popup v-model="shareModal.isShow" mode="bottom" border-radius="16" height="600px" :mask-close-able="true">
 			<mainPanel :showBg="true" :rid="rid" :oid="oid" :active="1" :name="orderDetail.userName" :job="orderDetail.storeJobName" :recommendList="recommendList[0]" />
-		</u-popup>
+		</u-popup> -->
 	</view>
 </template>
 
@@ -1155,7 +1155,7 @@ export default {
 				return false;
 			}
 			that.goImLoading = true;
-			that.F.wyyxGet(that.api.job_get_agency_cus + "?agencyId=" + val.info == "up" ? that.orderDetail.upAgencyId : that.orderDetail.downAgencyId, {}, (cusData) => {
+			that.F.wyyxGet(that.api.job_get_agency_cus + "?agencyId=" + (val.info == "up" ? that.orderDetail.upAgencyId : that.orderDetail.downAgencyId), {}, (cusData) => {
 				console.log("cusDatacusDatacusDatacusData", cusData);
 				if (val.type == "im") {
 					that.goIm(cusData);
@@ -1183,6 +1183,7 @@ export default {
 					receiverAccid: cusData.accid,
 				},
 				(res) => {
+					console.log("111111111111111111111111111111111", res);
 					uni.$UIKitStore.uiStore.selectConversation(res.conversationId);
 					let params = {
 						工单信息: "",
@@ -1200,6 +1201,7 @@ export default {
 							text: that.G.objToStr(params, "copy"),
 						},
 						(res) => {
+							console.log("222222222222222222222222222222222", res);
 							uni.navigateTo({
 								url: "/root/NEUIKit/pages/Chat/index",
 							});

root/person/avatar.vue

@@ -84,7 +84,7 @@ export default {
 							icon: "success",
 						});
 						that.G.checkToken();
-						uni.setStorageSync("apply-avatar", res);
+						uni.setStorageSync("apply-avatar", res.image);
 						setTimeout(() => {
 							uni.navigateBack();
 						}, 1500);

root/person/change.vue

@@ -141,6 +141,7 @@ export default {
 					that.G.checkToken();
 
 					setTimeout(() => {
+						uni.$emit("getBossAddress");
 						uni.navigateBack();
 					}, 1500);
 				}
@@ -151,7 +152,6 @@ export default {
 			this.info.value.address = e.address;
 			this.info.value.lat = e.lat;
 			this.info.value.lng = e.lng;
-			uni.$emit("getBossAddress", that.avatar);
 		},
 	},
 };

root/person/changeTeam.vue

@@ -29,11 +29,11 @@
 			/>
 		</view> -->
 	</scroll-view>
-	<g-panel-fixed>
+	<g-panel-fixed backgroundColor="#ededed" :border="false">
 		<slot>
 			<view class="g_ml_10 g_mr_10 g_position_rela">
 				<div class="g_w_8 g_h_8 g_radius_50 g_bg_f0a g_position_abso" style="right: 50px; top: 0px" v-if="readed && readed > 0"></div>
-				<g-button btnText="合并团队" type="primary" size="default" @clickBtn="goMarge" />
+				<div class="g_text_c g_c_sub g_fs_14" @click="goMarge">合并团队</div>
 			</view>
 		</slot>
 	</g-panel-fixed>

root/person/set.vue

@@ -66,7 +66,7 @@
 				@clickItem="handleClickItem"
 			/>
 		</view>
-		<view class="g_mt_10 g_ml_10 g_mr_10">
+		<view class="g_mt_24 g_ml_10 g_mr_10">
 			<g-button btnText="切换团队" type="none" size="medium" @clickBtn="toChangeTeam" mode="square" />
 			<!-- <g-panel-form-item
 				:list="[
@@ -81,7 +81,7 @@
 				@clickItem="handleClickItem"
 			/> -->
 		</view>
-		<view class="g_mt_24 g_ml_10 g_mr_10">
+		<view class="g_mt_10 g_ml_10 g_mr_10">
 			<g-button btnText="退出登录" type="delete" size="medium" @clickBtn="handleLayout" mode="square" />
 		</view>
 		<u-popup v-model="showTeamToggle" class="" mode="bottom" uZindex="9999" :closeable="true" border-radius="12" :mask-close-able="true">