add

App.vue

@@ -92,12 +92,20 @@
 				console.log('消息成功' + JSON.stringify(option));
 			});
 
-
 			uni.onHostEventReceive((event, data) => {
 				if (event == 'tocustomlist') {
+					Toast("收到消息")
+					Toast(JSON.stringify(event))
+					Toast(JSON.stringify(data))
+					if (data.page_type == 1) {
 						uni.switchTab({
-						url: '/pages/chat/customer_list/index'
+							url: data.route
 						});
+					} else {
+						uni.navigateTo({
+							url: data.route
+						})
+					}
 				}
 			});
 

components/WaterfallsFlowItem/WaterfallsFlowItem.vue

@@ -44,8 +44,9 @@
 		<view class='text'>
 			<view class='name line2'>{{item.store_name}}</view>
 			<view class="score"><span
-					style="font-size: 23rpx;font-family: PingFang SC-Semibold, PingFang SC;font-weight: 600;color: #F84221;margin-right: 28rpx;">{{item.rate}}</span>
+					style="font-size: 23rpx;font-weight: 600;color: #F84221;margin-right: 28rpx;">{{item.rate}}</span>
-				{{item.reply_count}}条评论</view>
+				{{item.reply_count}}条评论
+			</view>
 			<view class="" style="display: flex;justify-content: space-between;">
 				<view class='money'>
 					<span style="font-size:30rpx;">￥</span>

components/WaterfallsFlowItem/WaterfallsFlowItemo.vue

@@ -84,7 +84,6 @@
 	.title {
 
 		font-size: 30rpx;
-		font-family: PingFang SC-Medium, PingFang SC;
 		font-weight: 500;
 		color: #333333;
 		margin: 12px 0;
@@ -110,7 +109,6 @@
 			border-radius: 11rpx 11rpx 11rpx 11rpx;
 			border: 1px solid #3274F9;
 			font-size: 19rpx;
-			font-family: PingFang SC-Regular, PingFang SC;
 			font-weight: 400;
 			margin-right: 15rpx;
 		}
@@ -125,7 +123,6 @@
 				border-radius: 11rpx 0px 0px 0rpx;
 				border: 1px solid #F84221;
 				font-size: 19rpx;
-				font-family: PingFang SC-Regular, PingFang SC;
 				font-weight: 400;
 			}
 
@@ -136,7 +133,6 @@
 				border-radius: 0px 11rpx 11rpx 0px;
 				border: 1px solid #F84221;
 				font-size: 19rpx;
-				font-family: PingFang SC-Regular, PingFang SC;
 				font-weight: 400;
 			}
 		}
@@ -161,7 +157,6 @@
 
 		.relase-two {
 			font-size: 23rpx;
-			font-family: PingFang SC-Regular, PingFang SC;
 			font-weight: 500;
 			color: #B3B3B3;
 			margin-left: 13rpx;
@@ -201,7 +196,6 @@
 		opacity: 1;
 		font-size: 23rpx;
 		padding-left: 11rpx;
-		font-family: PingFang SC-Regular, PingFang SC;
 		font-weight: 400;
 		color: #737373;
 

components/WaterfallsFlowItem/WaterfallsFlowItems.vue

@@ -64,8 +64,8 @@
 		width: 100% !important;
 		height: 345rpx;
 
-		image{
+		image {
-			width: 100% ;
+			width: 100%;
 			height: 345rpx;
 		}
 	}
@@ -94,7 +94,6 @@
 
 	.title {
 		font-size: 30rpx;
-		font-family: PingFang SC-Medium, PingFang SC;
 		font-weight: 500;
 		color: #333333;
 		margin: 12px 0;

components/WaterfallsFlowItemSupply/WaterfallsFlowItem.vue

@@ -44,8 +44,9 @@
 		<view class='text'>
 			<view class='name line2'>{{item.store_name}}</view>
 			<view class="score"><span
-					style="font-size: 23rpx;font-family: PingFang SC-Semibold, PingFang SC;font-weight: 600;color: #F84221;margin-right: 28rpx;">{{item.rate}}</span>
+					style="font-size: 23rpx;font-weight: 600;color: #F84221;margin-right: 28rpx;">{{item.rate}}</span>
-				{{item.reply_count}}条评论</view>
+				{{item.reply_count}}条评论
+			</view>
 			<view class="" style="display: flex;justify-content: space-between;">
 				<view class='money'>
 					<span style="font-size:30rpx;">￥</span>

components/WaterfallsFlowItemSupply/WaterfallsFlowItemo.vue

@@ -84,7 +84,6 @@
 	.title {
 
 		font-size: 30rpx;
-		font-family: PingFang SC-Medium, PingFang SC;
 		font-weight: 500;
 		color: #333333;
 		margin: 12px 0;
@@ -110,7 +109,6 @@
 			border-radius: 11rpx 11rpx 11rpx 11rpx;
 			border: 1px solid #3274F9;
 			font-size: 19rpx;
-			font-family: PingFang SC-Regular, PingFang SC;
 			font-weight: 400;
 			margin-right: 15rpx;
 		}
@@ -125,7 +123,6 @@
 				border-radius: 11rpx 0px 0px 0rpx;
 				border: 1px solid #F84221;
 				font-size: 19rpx;
-				font-family: PingFang SC-Regular, PingFang SC;
 				font-weight: 400;
 			}
 
@@ -136,7 +133,6 @@
 				border-radius: 0px 11rpx 11rpx 0px;
 				border: 1px solid #F84221;
 				font-size: 19rpx;
-				font-family: PingFang SC-Regular, PingFang SC;
 				font-weight: 400;
 			}
 		}
@@ -161,7 +157,6 @@
 
 		.relase-two {
 			font-size: 23rpx;
-			font-family: PingFang SC-Regular, PingFang SC;
 			font-weight: 500;
 			color: #B3B3B3;
 			margin-left: 13rpx;
@@ -201,7 +196,6 @@
 		opacity: 1;
 		font-size: 23rpx;
 		padding-left: 11rpx;
-		font-family: PingFang SC-Regular, PingFang SC;
 		font-weight: 400;
 		color: #737373;
 

components/WaterfallsFlowItemSupply/WaterfallsFlowItems.vue

@@ -64,8 +64,8 @@
 		width: 100% !important;
 		height: 345rpx;
 
-		image{
+		image {
-			width: 100% ;
+			width: 100%;
 			height: 345rpx;
 		}
 	}
@@ -94,7 +94,6 @@
 
 	.title {
 		font-size: 30rpx;
-		font-family: PingFang SC-Medium, PingFang SC;
 		font-weight: 500;
 		color: #333333;
 		margin: 12px 0;

components/content-bootom/index.vue

@@ -55,8 +55,6 @@
 
 
 		font-size: 30rpx;
-		font-family: PingFang SC-Regular,
-		PingFang SC;
 		font-weight: 400;
 		color: #333333;
 	}

components/copyPassword/index.vue

@@ -38,7 +38,9 @@
 	// #ifdef H5
 	import ClipboardJS from "@/plugin/clipboard/clipboard.js";
 	// #endif
-	import { mapGetters } from "vuex";
+	import {
+		mapGetters
+	} from "vuex";
 	export default {
 		props: {
 			isCopy: {
@@ -56,22 +58,22 @@
 				title: '复制以下口令'
 			};
 		},
-		mounted(){
+		mounted() {
 			let that = this
 			// #ifdef H5
 			that.$nextTick(function() {
 				var clipboard = new ClipboardJS('.copy-data');
 				clipboard.on('success', function(e) {
 					that.$util.Tips({
-						title:'复制成功'
+						title: '复制成功'
 					})
-					setTimeout(()=>{
+					setTimeout(() => {
 						that.$emit('close');
-					},500)
+					}, 500)
 				});
 				clipboard.on('error', function(e) {
 					that.$util.Tips({
-						title:'复制失败'
+						title: '复制失败'
 					})
 				});
 			});
@@ -79,15 +81,17 @@
 		},
 		methods: {
 			//#ifndef H5
-			copyText:function(){
+			copyText: function() {
 				let that = this;
-				uni.setClipboardData({ data: this.copyUrl });
+				uni.setClipboardData({
-				setTimeout(()=>{
+					data: this.copyUrl
+				});
+				setTimeout(() => {
 					that.$emit('close');
-				},500)			 
+				}, 500)
 			},
 			// #endif
-			close: function(){
+			close: function() {
 				this.$emit('close');
 			}
 		}
@@ -106,13 +110,15 @@
 		transform: translate3d(0, 100%, 0);
 		transition: all .1s cubic-bezier(.25, .5, .5, .9);
 		padding: 50rpx 30rpx 30rpx;
-		.icon-guanbi{
+
+		.icon-guanbi {
 			position: absolute;
 			top: 20rpx;
 			right: 20rpx;
 			color: #8A8A8A;
 		}
-		.button{
+
+		.button {
 			height: 76rpx;
 			border-radius: 38rpx;
 			margin: 30rpx 30rpx 0;
@@ -122,22 +128,25 @@
 			color: #FFFFFF;
 		}
 	}
+
 	.copy-list-window.on {
 		transform: translate3d(0, 0, 0);
 	}
+
 	.copy-list-window .title {
 		width: 100%;
 		text-align: center;
 		font-size: 32rpx;
 		font-weight: bold;
-		font-family: 'PingFang SC';
+
 		.iconfont {
 			font-size: 30rpx;
 			color: #FBB324;
 			margin-right: 12rpx;
 		}
 	}
-	.copy-url{
+
+	.copy-url {
 		margin-top: 30rpx;
 		background: #F5F5F5;
 		padding: 20rpx 25rpx;

components/cx-navTitle.vue

@@ -78,7 +78,6 @@
 		padding-right: 0rpx;
 		scroll-behavior: smooth; //平稳的滑动效果
 		font-size: 32rpx;
-		font-family: PingFang-SC-Heavy;
 
 		.my-tab-item {
 			padding: 20rpx 35rpx; //标签上下左右距离 -- 在这里改
@@ -89,7 +88,6 @@
 
 			&.active {
 				color: #333333; //标签选中颜色 -- 在这里改
-				font-family: PingFang-SC-Heavy;
 				font-weight: 600;
 				position: relative;
 
@@ -110,7 +108,6 @@
 						position: relative;
 						z-index: 9;
 						font-size: 32rpx;
-						font-family: PingFang SC;
 						font-weight: 500;
 						color: #F84221;
 						color: #F84221;

components/realselist/realselist.vue

@@ -159,14 +159,14 @@
 			checkedObj: {
 				handler(n) {
 
-					this.checkedArr = JSON.parse(JSON.stringify(n||{}))
+					this.checkedArr = JSON.parse(JSON.stringify(n || {}))
 				},
 				deep: true
 			}
 		},
 		mounted() {
-			this.checkedArr = JSON.parse(JSON.stringify(this.checkedObj||{}))
+			this.checkedArr = JSON.parse(JSON.stringify(this.checkedObj || {}))
-			this.aryys = JSON.parse(JSON.stringify(this.checkedObj||{}))
+			this.aryys = JSON.parse(JSON.stringify(this.checkedObj || {}))
 			this.getBounht();
 		},
 		methods: {
@@ -174,8 +174,8 @@
 			producrprice(e, i, item) {
 				this.bought[i].price = e.detail.value
 				// 处理数据回显时, 调整数量, 选中的数据不改变的问题
-        let obj = this.checkedArr.find((item)=>item.product_id==this.bought[i].product_id);
+				let obj = this.checkedArr.find((item) => item.product_id == this.bought[i].product_id);
-        obj ? obj.price = e.detail.value:null;
+				obj ? obj.price = e.detail.value : null;
 				// this.$set(item, 'check', false);
 				// for (let i in this.checkedArr) {
 				// 	if (this.checkedArr[i].product_id == item.product_id) {
@@ -217,8 +217,8 @@
 				this.peicenumber = data.number;
 				this.bought[i].number = data.number;
 				// 处理数据回显时, 调整数量, 选中的数据不改变的问题
-        let obj = this.checkedArr.find((item)=>item.product_id==this.bought[i].product_id);
+				let obj = this.checkedArr.find((item) => item.product_id == this.bought[i].product_id);
-        obj ? obj.number = data.number:null;
+				obj ? obj.number = data.number : null;
 			},
 
 			tabs(index) {
@@ -289,7 +289,7 @@
 							that.$set(item, 'check', true);
 							that.$set(item, 'number', val.number);
 							that.$set(item, 'price', val.price);
-							that.peicenumber=val.number
+							that.peicenumber = val.number
 						}
 					})
 				})
@@ -483,7 +483,6 @@
 				line-height: 60rpx;
 				text-align: center;
 				font-size: 28rpx;
-				font-family: PingFang SC-Regular, PingFang SC;
 				font-weight: 400;
 				color: #959595;
 				background-color: #E7E6E4;
@@ -512,9 +511,7 @@
 					background: #F5F5F5;
 					border-radius: 7rpx 7rpx 7rpx 7rpx;
 					font-size: 28rpx;
-					font-family: PingFang SC-Regular, PingFang SC;
 					font-weight: 400;
-
 					margin-left: 20rpx;
 
 

components/release/release.vue

@@ -64,7 +64,7 @@
 		methods: {
 			navigtion(item) {
 
-				if (item.title1 =='发布调货商品') {
+				if (item.title1 == '发布调货商品') {
 					uni.navigateTo({
 						url: '/pages/trading_hall/transfer_goods/index'
 					})
@@ -163,14 +163,12 @@
 
 		.title1 {
 			font-size: 32rpx;
-			font-family: PingFang SC-Medium, PingFang SC;
 			font-weight: 500;
 			color: #333333;
 		}
 
 		.title2 {
 			font-size: 28rpx;
-			font-family: PingFang SC-Regular, PingFang SC;
 			font-weight: 400;
 			color: #666666;
 			margin-top: 11rpx;

components/shoppinglist/shoppinglist.vue

@@ -159,14 +159,14 @@
 			checkedObj: {
 				handler(n) {
 
-					this.checkedArr = JSON.parse(JSON.stringify(n||{}))
+					this.checkedArr = JSON.parse(JSON.stringify(n || {}))
 				},
 				deep: true
 			}
 		},
 		mounted() {
-			this.checkedArr = JSON.parse(JSON.stringify(this.checkedObj||{}))
+			this.checkedArr = JSON.parse(JSON.stringify(this.checkedObj || {}))
-			this.aryys = JSON.parse(JSON.stringify(this.checkedObj||{}))
+			this.aryys = JSON.parse(JSON.stringify(this.checkedObj || {}))
 			this.getBounht();
 		},
 		methods: {
@@ -174,8 +174,8 @@
 			producrprice(e, i, item) {
 				this.bought[i].price = e.detail.value
 				// 处理数据回显时, 调整数量, 选中的数据不改变的问题
-        let obj = this.checkedArr.find((item)=>item.product_id==this.bought[i].product_id);
+				let obj = this.checkedArr.find((item) => item.product_id == this.bought[i].product_id);
-        obj ? obj.price = e.detail.value:null;
+				obj ? obj.price = e.detail.value : null;
 				// this.$set(item, 'check', false);
 				// for (let i in this.checkedArr) {
 				// 	if (this.checkedArr[i].product_id == item.product_id) {
@@ -213,8 +213,8 @@
 				this.peicenumber = data.number;
 				this.bought[i].number = data.number
 				// 处理数据回显时, 调整数量, 选中的数据不改变的问题
-        let obj = this.checkedArr.find((item)=>item.product_id==this.bought[i].product_id);
+				let obj = this.checkedArr.find((item) => item.product_id == this.bought[i].product_id);
-        obj ? obj.number = data.number:null;
+				obj ? obj.number = data.number : null;
 			},
 
 			tabs(index) {
@@ -285,7 +285,7 @@
 							that.$set(item, 'check', true);
 							that.$set(item, 'number', val.number);
 							that.$set(item, 'price', val.price);
-							that.peicenumber=val.number
+							that.peicenumber = val.number
 						}
 					})
 				})
@@ -456,7 +456,6 @@
 				line-height: 60rpx;
 				text-align: center;
 				font-size: 28rpx;
-				font-family: PingFang SC-Regular, PingFang SC;
 				font-weight: 400;
 				color: #959595;
 				background-color: #E7E6E4;
@@ -485,7 +484,6 @@
 					background: #F5F5F5;
 					border-radius: 7rpx 7rpx 7rpx 7rpx;
 					font-size: 28rpx;
-					font-family: PingFang SC-Regular, PingFang SC;
 					font-weight: 400;
 
 					margin-left: 20rpx;

components/shortPopup.vue

@@ -4,7 +4,8 @@
 			<view class="pop">
 				<scroll-view scroll-y class="scroll">
 					<view class="image">
-              <swiper class="swiper" :current="current" autoplay style="width: 100%;height: 100%;" @change="changeCurrent">
+						<swiper class="swiper" :current="current" autoplay style="width: 100%;height: 100%;"
+							@change="changeCurrent">
 							<block v-if="product.slider_image && product.slider_image.length>0">
 								<swiper-item v-for="(item,index) in product.slider_image" :key="index">
 									<image class="img" :src="item" :lazy-load="true"></image>
@@ -14,7 +15,8 @@
 								<image class="img" :src="datas.image||defualtImg"></image>
 							</swiper-item>
 						</swiper>
-              <view class="current">{{current+1}}/{{product.slider_image && product.slider_image.length||1}}</view>
+						<view class="current">{{current+1}}/{{product.slider_image && product.slider_image.length||1}}
+						</view>
 						<image class="close" src="@/static/images/icon/close.png" @click="close()"></image>
 						<view class="border"></view>
 					</view>
@@ -49,17 +51,20 @@
 									({{once_min_count}}件起购)
 								</view>
 								<view class="input_item sub" @click="subCartNum">-</view>
-                  <input class="input_item input_view" v-model="cart_num" type="number" @input="inputCartNum" @blur="inputCartNumBlur" />
+								<input class="input_item input_view" v-model="cart_num" type="number"
+									@input="inputCartNum" @blur="inputCartNumBlur" />
 								<view class="input_item plus" @click="plusCartNum">+</view>
 							</view>
 						</view>
 						<view>
-                商品库存 <text style="margin-left: 20rpx;">{{sku[changeSkuKey] ? sku[changeSkuKey].stock : change.stock}}</text>
+							商品库存 <text
+								style="margin-left: 20rpx;">{{sku[changeSkuKey] ? sku[changeSkuKey].stock : change.stock}}</text>
 						</view>
 					</view>
 				</scroll-view>
 				<view class="button">
-          <view class="b_icon" @click="navgo(source==12 ? '/pages/nongKe/supply_chain/shopping_trolley_other?source='+source : '/pages/nongKe/supply_chain/shopping_trolley_a')">
+					<view class="b_icon"
+						@click="navgo(source==12 ? '/pages/nongKe/supply_chain/shopping_trolley_other?source='+source : '/pages/nongKe/supply_chain/shopping_trolley_a')">
 						<image src="@/static/images/icon/car.png"></image>
 						<view>采购车</view>
 						<view class="badge" v-if="goodsNum">
@@ -79,11 +84,13 @@
 		postCartAdd,
 		getProductDetail
 	} from '@/api/store.js';
-  import { Toast } from '../libs/uniApi';
+	import {
+		Toast
+	} from '../libs/uniApi';
 	export default {
 		name: "shortPopup",
 		props: {
-      source:{
+			source: {
 				type: String | Number,
 				default: null
 			}
@@ -115,14 +122,13 @@
 				once_min_count: 1, //最少购买件数
 			};
 		},
-    mounted() {
+		mounted() {},
+		computed: {
+			leftPrice() {
+				return this.sku[this.changeSkuKey]?.wholesale_price?.split('.')[0] || '0';
 			},
-    computed:{
+			rightPrice() {
-      leftPrice(){
+				return this.sku[this.changeSkuKey]?.wholesale_price?.split('.')[1] || '00';
-        return this.sku[this.changeSkuKey]?.wholesale_price?.split('.')[0]||'0';
-      },
-      rightPrice(){
-        return this.sku[this.changeSkuKey]?.wholesale_price?.split('.')[1]||'00';
 			}
 		},
 		methods: {
@@ -135,31 +141,31 @@
 				this.change = this.attrValue[0];
 				this.cart_num = 1;
 				this.current = 0;
-        getProductDetail(datas.product_id,{
+				getProductDetail(datas.product_id, {
 					product_type: 98
-        }).then((res)=>{
+				}).then((res) => {
-          this.sku = res.data.sku||{};
+					this.sku = res.data.sku || {};
 					this.sku_key_list = Object.keys(this.sku);
 					this.attr = res.data.attr;
-          if(res.data.once_min_count>1){
+					if (res.data.once_min_count > 1) {
 						this.cart_num = res.data.once_min_count;
 						this.once_min_count = res.data.once_min_count;
 					}
-          if(this.attr.length>0){
+					if (this.attr.length > 0) {
-            this.attr.forEach((item, index)=>{
+						this.attr.forEach((item, index) => {
 							this.changeAttr(index, 0);
 						})
-          }else this.changeSkuKey = this.sku_key_list[0] || '';
+					} else this.changeSkuKey = this.sku_key_list[0] || '';
 				})
 			},
 			// 输入购买数量
 			inputCartNum(e) {
-        if(/\D/.test(this.cart_num+'')){
+				if (/\D/.test(this.cart_num + '')) {
-          return this.$nextTick(()=>{
+					return this.$nextTick(() => {
 						this.cart_num = this.cart_num.replace(/\D/g, '');
 					})
 				}
-        if(this.sku){
+				if (this.sku) {
 					if (+e.detail.value > this.sku[this.changeSkuKey].stock) {
 						uni.showToast({
 							icon: 'none',
@@ -169,7 +175,7 @@
 							this.cart_num = this.sku[this.changeSkuKey].stock;
 						})
 					}
-        }else if (this.change.stock <= this.cart_num) {
+				} else if (this.change.stock <= this.cart_num) {
 					uni.showToast({
 						icon: 'none',
 						title: '不能超出库存哦'
@@ -180,13 +186,13 @@
 				}
 			},
 			// 输入框失去焦点
-      inputCartNumBlur(e){
+			inputCartNumBlur(e) {
-        if(+e.detail.value < this.once_min_count){
+				if (+e.detail.value < this.once_min_count) {
 					uni.showToast({
 						icon: 'none',
 						title: `至少要买${this.once_min_count}件哦`
 					})
-          this.$u.sleep(500).then(()=>{
+					this.$u.sleep(500).then(() => {
 						this.cart_num = this.once_min_count;
 					})
 				}
@@ -204,14 +210,14 @@
 			// 增加购买数量
 			plusCartNum() {
 				console.log('加', this.changeSkuKey);
-        if(this.sku){
+				if (this.sku) {
 					if (this.sku[this.changeSkuKey].stock <= this.cart_num) {
 						return uni.showToast({
 							icon: 'none',
 							title: '不能超出库存哦'
 						})
 					}
-        }else if (this.change.stock <= this.cart_num) {
+				} else if (this.change.stock <= this.cart_num) {
 					return uni.showToast({
 						icon: 'none',
 						title: '不能超出库存哦'
@@ -222,8 +228,8 @@
 			changeAttr: function(indexw, indexn) {
 				let that = this;
 				this.$set(this.attr[indexw], 'index', this.attr[indexw].attr_values[indexn]);
-        this.attr[indexw].attr_value.forEach((item, index)=>{
+				this.attr[indexw].attr_value.forEach((item, index) => {
-          if(index==indexn)item.check = true;
+					if (index == indexn) item.check = true;
 					else item.check = false;
 				})
 				let value = that.getCheckedValue().join(",");
@@ -245,9 +251,9 @@
 			// 加入购物车
 			addcart() {
 				// return console.log(this.sku[this.changeSkuKey]);
-        if(this.cart_num<this.once_min_count) return Toast(`至少要购买${this.once_min_count}件哦`);
+				if (this.cart_num < this.once_min_count) return Toast(`至少要购买${this.once_min_count}件哦`);
-        if(!this.sku[this.changeSkuKey]) return Toast('该规格有错误, 请选择其他规格');
+				if (!this.sku[this.changeSkuKey]) return Toast('该规格有错误, 请选择其他规格');
-        if(+this.sku[this.changeSkuKey].wholesale_price * +this.cart_num<=0) return Toast('无法购买价格小于等于0的商品');
+				if (+this.sku[this.changeSkuKey].wholesale_price * +this.cart_num <= 0) return Toast('无法购买价格小于等于0的商品');
 				if (this.sku[this.changeSkuKey]) {
 					if (this.cart_num > this.sku[this.changeSkuKey].stock) return uni.showToast({
 						icon: 'none',
@@ -259,7 +265,7 @@
 						product_attr_unique: this.sku[this.changeSkuKey].unique,
 						product_id: this.datas.product_id,
 						product_type: this.datas.product_type,
-            source: this.source||11, // 11-供货采购
+						source: this.source || 11, // 11-供货采购
 						spread_id: "",
 					}
 					let that = this
@@ -287,7 +293,7 @@
 				}
 			},
 			// 滑动轮播图
-      changeCurrent(e){
+			changeCurrent(e) {
 				this.current = e.detail.current;
 			},
 			navgo(url) {
@@ -315,7 +321,7 @@
 		overflow: hidden;
 		position: relative;
 
-    .scroll{
+		.scroll {
 			height: calc(80vh - 150rpx);
 		}
 
@@ -329,7 +335,7 @@
 			width: 750rpx;
 			position: relative;
 
-      .current{
+			.current {
 				position: absolute;
 				bottom: 70rpx;
 				left: 30rpx;
@@ -340,7 +346,6 @@
 				text-align: center;
 				color: #fff;
 				font-size: 26rpx;
-        font-family: PingFang SC-Regular, PingFang SC;
 				font-weight: 400;
 			}
 
@@ -392,7 +397,6 @@
 
 			.short_name {
 				font-size: 33rpx;
-        font-family: PingFang SC-Semibold, PingFang SC;
 				font-weight: 600;
 				color: #333333;
 			}
@@ -415,7 +419,6 @@
 
 			.m_title {
 				font-size: 30rpx;
-        font-family: PingFang SC-Medium, PingFang SC;
 				font-weight: 500;
 				color: #333333;
 				margin-top: 31rpx;
@@ -437,7 +440,7 @@
 				margin-bottom: 20rpx;
 			}
 
-      .attr_active{
+			.attr_active {
 				// background-color: #FEF5F3;
 				// color: #F84221;
 				background-color: #F84221;
@@ -454,7 +457,7 @@
 					align-items: center;
 					height: 48rpx;
 
-          .min-count{
+					.min-count {
 						font-size: 26rpx;
 						margin-right: 20rpx;
 						color: #F84221;
@@ -543,7 +546,6 @@
 				justify-content: center;
 				align-items: center;
 				font-size: 30rpx;
-        font-family: PingFang SC-Medium, PingFang SC;
 				font-weight: 500;
 				color: #FFFFFF;
 			}

pages/admin/financial_management/index.vue

@@ -4,24 +4,14 @@
 			<view class="top">
 				<view>
 					<view v-if="user_id == 0" class="accont">
-            <u--image
+						<u--image :showLoading="true" :src="userInfo.avatar || '../../static/img/public/man.png'"
-              :showLoading="true"
+							width="44px" height="44px" shape="circle"></u--image>
-              :src="userInfo.avatar || '../../static/img/public/man.png'"
-              width="44px"
-              height="44px"
-              shape="circle"
-            ></u--image>
 						<view class="name">{{ userInfo.nickname }}</view>
 						<!-- <u-icon name="setting-fill" color="white" size="20"></u-icon> -->
 					</view>
 					<view v-else class="accont">
-            <u--image
+						<u--image :showLoading="true" :src="userInfo.avatar || '../../static/img/public/man.png'"
-              :showLoading="true"
+							width="44px" height="44px" shape="circle"></u--image>
-              :src="userInfo.avatar || '../../static/img/public/man.png'"
-              width="44px"
-              height="44px"
-              shape="circle"
-            ></u--image>
 
 						<view class="name">{{ userInfo.nickname }}</view>
 						<!-- <u-icon name="setting-fill" color="white" size="20"></u-icon> -->
@@ -33,22 +23,14 @@
 			</view>
 			<view class="center">
 				<view class="title">
-          <text style="margin-right: 20rpx">账户总金额(元)</text
+					<text style="margin-right: 20rpx">账户总金额(元)</text><uni-icons @click="updateEye()"
-          ><uni-icons
+						:type="eyeType ? 'eye-filled' : 'eye-slash-filled'" color="#fff"></uni-icons>
-            @click="updateEye()"
-            :type="eyeType ? 'eye-filled' : 'eye-slash-filled'"
-            color="#fff"
-          ></uni-icons>
 				</view>
-        <view class="price" v-show="eyeType"
+				<view class="price" v-show="eyeType">{{ all_money }}元</view>
-          >{{ all_money }}元</view
-        >
 				<view class="price" v-show="!eyeType">****元</view>
 				<view class="bubble">
 					<!-- <image src="../../static/img/contract/bubble.png"></image> -->
-          <view class="text" v-show="eyeType"
+					<view class="text" v-show="eyeType">可提现金额{{ userInfo.user_money || 0.0 }}元</view>
-            >可提现金额{{ userInfo.user_money || 0.0 }}元</view
-          >
 					<view class="text" v-show="!eyeType">可提现金额****元</view>
 				</view>
 			</view>
@@ -72,11 +54,7 @@
 		</view>
 		<view class="bill">
 			<view style="width: 100%; height: 90rpx; background-color: #fff"></view>
-      <uni-section
+			<uni-section titleFontSize="32rpx" type="line" title="账单流水"></uni-section>
-        titleFontSize="32rpx"
-        type="line"
-        title="账单流水"
-      ></uni-section>
 			<!-- <u-subsection :list="billTypeList" :current="current" mode="subsection"></u-subsection> -->
 			<!-- <view class="type_box">
         <view class="type">
@@ -129,11 +107,8 @@
 									<text v-if="item.change_type == 202" style="color: #46be61">{{
                     item.type_desc
                   }}</text>
-                  <text
+									<text v-else-if="item.change_type == 203"
-                    v-else-if="item.change_type == 203"
+										style="color: #ff7c32">{{ item.type_desc }}</text>
-                    style="color: #ff7c32"
-                    >{{ item.type_desc }}</text
-                  >
 									<text v-else="item.change_type == 203">{{
                     item.type_desc
                   }}</text>
@@ -172,12 +147,8 @@
 				</view>
 
 				 -->
-        <u-loadmore
+				<u-loadmore :status="loadConfig.status" :loading-text="loadConfig.loadingText"
-          :status="loadConfig.status"
+					:loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
-          :loading-text="loadConfig.loadingText"
-          :loadmore-text="loadConfig.loadmoreText"
-          :nomore-text="loadConfig.nomoreText"
-        />
 			</view>
 			<!-- 月账单 -->
 			<view class="bill_list" v-show="current == 1">
@@ -192,11 +163,9 @@
 							<view class="num">{{ item.income }}</view>
 						</view>
 						<view class="right">
-              <view
+							<view>支出金额:{{
-                >支出金额:{{
                   item.expenditure > 0 ? item.expenditure : "0.00"
-                }}</view
+                }}</view>
-              >
 							<view>入账金额:{{ item.income > 0 ? item.income : "0.00" }}</view>
 						</view>
 					</view>
@@ -210,24 +179,24 @@
 </template>
 
 <script>
-// import {
+	// import {
-//   accountLogLists,
+	//   accountLogLists,
-//   accountLogListsMonth
+	//   accountLogListsMonth
-// } from "@/api/pay.js"
+	// } from "@/api/pay.js"
-// import {
+	// import {
-//   userInfo
+	//   userInfo
-// } from "@/api/oaUser.js"
+	// } from "@/api/oaUser.js"
 
-// import {
+	// import {
-//   Toast
+	//   Toast
-// } from '@/libs/uniApi.js'
+	// } from '@/libs/uniApi.js'
 	import {
 
 		getUserInfo,
 
 	} from '@/api/user.js';
-export default {
+	export default {
-  data () {
+		data() {
 			return {
 				user_id: 0,
 				userInfo: {},
@@ -235,7 +204,7 @@ export default {
 				billTypeList: ['日账单', '月账单'],
 				current: 0,
 				billList: [],
-	  eyeType:true,
+				eyeType: true,
 				billListMonth: [],
 				loadConfig: {
 					page: 1,
@@ -247,14 +216,14 @@ export default {
 				},
 			}
 		},
-  onLoad (e) {
+		onLoad(e) {
 			if (e.id > 0) {
 				this.user_id = e.id
 
 			}
 			// this.loadBill()
 		},
-  onShow () {
+		onShow() {
 
 			if (this.user_id == 0) {
 				this.userInfo = this.$store.state.app.userInfo;
@@ -270,30 +239,30 @@ export default {
 			// eyeType () {
 			//   return this.$store.state.config.eyeType;
 			// },
-    all_money(){
+			all_money() {
 				let str = 0.00;
 
-      try{
+				try {
-        this.userInfo.user_money?str=str+parseFloat(this.userInfo.user_money):0.00;
+					this.userInfo.user_money ? str = str + parseFloat(this.userInfo.user_money) : 0.00;
-        this.userInfo.deposit?str=str+parseFloat(this.userInfo.deposit):0.00;
+					this.userInfo.deposit ? str = str + parseFloat(this.userInfo.deposit) : 0.00;
 					str = str.toFixed(2);
-      }catch(e){
+				} catch (e) {
 					str = 0.00;
 				}
 				return str;
 			}
 		},
-  onBackPress () {
+		onBackPress() {
 			this.loadBill()
 		},
 		methods: {
-    navTo (url) {
+			navTo(url) {
 				url ?
 					uni.navigateTo({
 						url: url
 					}) : Toast('暂未开放')
 			},
-    async OtherUserInfo () {
+			async OtherUserInfo() {
 				// let res = await userInfo({
 				//   id: this.user_id
 				// });
@@ -309,15 +278,15 @@ export default {
 				});
 				// this.userInfo = res.data
 			},
-    updateEye () {
+			updateEye() {
-       this.eyeType=!this.eyeType
+				this.eyeType = !this.eyeType
 			},
 			// 选择日账单月账单
-    changeBillType (type) {
+			changeBillType(type) {
 				this.current = type;
 				if (type == 1) this.loadBillMonth();
 			},
-    async loadBill () {
+			async loadBill() {
 				if (this.loadConfig.status == "nomore") return;
 				this.loadConfig.status = "loading"
 				let res = await accountLogLists({
@@ -334,7 +303,7 @@ export default {
 				}
 				this.billList = [...this.billList, ...res.data.lists];
 			},
-    async loadBillMonth () {
+			async loadBillMonth() {
 				let res = await accountLogListsMonth();
 				let list = [];
 				for (let key in res.data) {
@@ -343,18 +312,18 @@ export default {
 				this.billListMonth = list;
 			}
 		},
-  onPullDownRefresh () {
+		onPullDownRefresh() {
 			uni.stopPullDownRefresh()
 		}
-}
+	}
 </script>
 
 <style lang="scss">
-page {
+	page {
 		// background-color: #fff;
-}
+	}
 
-.finance_head {
+	.finance_head {
 		background-color: #f02828;
 		height: 400rpx;
 		position: relative;
@@ -441,8 +410,7 @@ page {
 				background-repeat: no-repeat;
 				background-size: 100% 100%;
 
-      .text {
+				.text {}
-      }
 			}
 		}
 
@@ -475,9 +443,9 @@ page {
 				}
 			}
 		}
-}
+	}
 
-.bill {
+	.bill {
 		// padding: 28rpx;
 		// padding-top: 90rpx;
 		padding-bottom: 32rpx;
@@ -599,7 +567,6 @@ page {
 				.top {
 					margin-bottom: 28rpx;
 					font-size: 25rpx;
-        font-family: PingFang SC-Regular, PingFang SC;
 					font-weight: 400;
 					color: #333333;
 
@@ -670,5 +637,5 @@ page {
 			left: 50%;
 			transform: translate(-50%, -50%);
 		}
-}
+	}
 </style>

pages/commissionedSales/addDelegation/index.vue

@@ -9,8 +9,8 @@
 						<view class="item-one">
 							被委托商家
 						</view>
-						<e-select v-model="formData.entrust_mer_id" :value='formData.entrust_mer_id' :options="options1" @change="change1"
+						<e-select v-model="formData.entrust_mer_id" :value='formData.entrust_mer_id' :options="options1"
-							placeholder="选择选项"></e-select>
+							@change="change1" placeholder="选择选项"></e-select>
 					</view>
 					<view class="release_item-one">
 						<view class="item-one">
@@ -177,7 +177,7 @@
 					this.productList = data;
 					for (let i in data) {
 						this.formData.content += data[i].store_name + ',';
-            if(typeof this.productList[i].image == 'object'){
+						if (typeof this.productList[i].image == 'object') {
 							this.productList[i].image = this.productList[i].image[0]
 						}
 						this.formData.product_info.push({
@@ -187,7 +187,7 @@
 						})
 					}
 				}
-        this.formData.content = this.formData.content.slice(0,-1);
+				this.formData.content = this.formData.content.slice(0, -1);
 				this.$refs.associated.close()
 			},
 			//提交
@@ -211,8 +211,8 @@
 				if (!value.entrust_mer_id) return that.$util.Tips({
 					title: '请添加商家'
 				});
-				this.type?
+				this.type ?
-				editentrust(this.id,value).then(res => {
+					editentrust(this.id, value).then(res => {
 						if (res.status == '200') {
 							uni.hideLoading()
 							that.$util.Tips({
@@ -316,7 +316,6 @@
 				.center-one-txt {
 					.one-txta {
 						font-size: 32rpx;
-						font-family: PingFang SC;
 						font-weight: 500;
 						color: #333333;
 					}
@@ -325,7 +324,6 @@
 						display: flex;
 						margin-top: 28rpx;
 						font-size: 32rpx;
-						font-family: PingFang SC;
 						font-weight: 400;
 						color: #999999;
 
@@ -351,7 +349,6 @@
 					margin-top: 32rpx;
 					margin-bottom: 20rpx;
 					font-size: 32rpx;
-					font-family: PingFang SC-Regular, PingFang SC;
 					font-weight: 400;
 					color: #333333;
 				}
@@ -525,7 +522,6 @@
 		background: linear-gradient(84deg, #F98649 0%, #F34E45 100%);
 		border-radius: 42px 42px 42px 42px;
 		font-size: 32rpx;
-		font-family: PingFang SC;
 		font-weight: 500;
 		color: #FFFFFF;
 	}

pages/commissionedSales/delegation_details/index.vue

@@ -101,7 +101,8 @@
 					<view class="center-twoa">
 						拒绝原因:
 					</view>
-					<view class="center-twob" :style="{'text-align':objinfo.entrust_finish_refusal.length<15?'right':'left'}">
+					<view class="center-twob"
+						:style="{'text-align':objinfo.entrust_finish_refusal.length<15?'right':'left'}">
 						{{objinfo.entrust_finish_refusal}}
 					</view>
 				</view>
@@ -233,7 +234,6 @@
 
 			.top-two-one {
 				font-size: 35rpx;
-				font-family: PingFang SC-Medium, PingFang SC;
 				font-weight: 500;
 				color: #FFFFFF;
 				margin-top: 10rpx;
@@ -280,7 +280,6 @@
 				.center-one-txt {
 					.one-txta {
 						font-size: 32rpx;
-						font-family: PingFang SC;
 						font-weight: 500;
 						color: #333333;
 					}
@@ -289,7 +288,6 @@
 						display: flex;
 						margin-top: 28rpx;
 						font-size: 32rpx;
-						font-family: PingFang SC;
 						font-weight: 400;
 						color: #999999;
 
@@ -316,7 +314,6 @@
 
 				.center-twoa {
 					font-size: 32rpx;
-					font-family: PingFang SC;
 					font-weight: 400;
 					color: #333333;
 				}
@@ -327,7 +324,6 @@
 
 					word-wrap: break-word;
 					font-size: 32rpx;
-					font-family: PingFang SC;
 					font-weight: 400;
 					color: #999999;
 				}
@@ -377,7 +373,6 @@
 		background: linear-gradient(84deg, #F98649 0%, #F34E45 100%);
 		border-radius: 42px 42px 42px 42px;
 		font-size: 32rpx;
-		font-family: PingFang SC;
 		font-weight: 500;
 		color: #FFFFFF;
 		position: absolute;

pages/commissionedSales/index/index.vue

@@ -147,7 +147,6 @@
 
 			.titlea {
 				font-size: 32rpx;
-				font-family: PingFang SC;
 				font-weight: 500;
 				color: #FFFFFF;
 			}
@@ -155,7 +154,6 @@
 			.titleb {
 				margin-top: 5rpx;
 				font-size: 25rpx;
-				font-family: PingFang SC;
 				font-weight: 400;
 				color: rgba(255, 255, 255, 0.8);
 			}

pages/commissionedSales/initiateDelegation/index.vue

@@ -418,7 +418,7 @@
 				// this.$refs.bindmobile2.open()
 				this.$refs.bindmobile3.open()
 			},
-			agree(item, status=2) {
+			agree(item, status = 2) {
 				finishentrust(item.community_id, {
 					status: status,
 					refusal: this.refuseds
@@ -438,10 +438,10 @@
 			//删除订单
 			deleteOrder(item) {
 				uni.showModal({
-          title:'警告',
+					title: '警告',
-          content:'删除后不可恢复, 是否继续删除?',
+					content: '删除后不可恢复, 是否继续删除?',
 					complete: (e) => {
-            if(e.confirm){
+						if (e.confirm) {
 							checkchain(item.community_id, {
 								status: 3
 							}).then(res => {
@@ -542,7 +542,6 @@
 
 		.adddelegation-two {
 			font-size: 32rpx;
-			font-family: PingFang SC-Medium, PingFang SC;
 			font-weight: 500;
 			color: #FFFFFF;
 			margin-top: 25rpx;
@@ -593,7 +592,6 @@
 
 				.txt-b-a {
 					font-size: 32rpx;
-					font-family: PingFang SC;
 					font-weight: 500;
 					color: #333333;
 				}
@@ -612,7 +610,6 @@
 
 					.txt-b-b {
 						font-size: 28rpx;
-						font-family: PingFang SC;
 						font-weight: 400;
 						color: #333333
 					}
@@ -620,20 +617,23 @@
 
 			}
 
-      .content-text{
+			.content-text {
 				flex: 1;
 				display: flex;
 				flex-direction: column;
 				justify-content: space-between;
-        .text-bottom{
+
+				.text-bottom {
 					display: flex;
 					justify-content: space-between;
 				}
-        .one-txt-a{
+
+				.one-txt-a {
 					flex: 1;
 					font-size: 30rpx;
 					display: -webkit-box;
-          -webkit-line-clamp: 2; /* 限制为三行 */
+					-webkit-line-clamp: 2;
+					/* 限制为三行 */
 					-webkit-box-orient: vertical;
 					overflow: hidden;
 					text-overflow: ellipsis;
@@ -686,7 +686,6 @@
 
 				.contentgn_a {
 					font-size: 32rpx;
-					font-family: PingFang SC;
 					font-weight: 400;
 					color: #F84221;
 					margin-right: 10rpx;
@@ -704,7 +703,6 @@
 
 				.contentgn_b {
 					font-size: 32rpx;
-					font-family: PingFang SC;
 					font-weight: 400;
 					color: #999999;
 					margin-left: 10rpx;
@@ -760,7 +758,6 @@
 
 				.contentgn_a {
 					font-size: 32rpx;
-					font-family: PingFang SC;
 					font-weight: 400;
 					color: #F84221;
 					margin-right: 10rpx;
@@ -777,7 +774,6 @@
 
 				.contentgn_b {
 					font-size: 32rpx;
-					font-family: PingFang SC;
 					font-weight: 400;
 					color: #999999;
 					margin-left: 10rpx;
@@ -819,7 +815,6 @@
 				.bg-content-a {
 					margin-left: 242rpx;
 					font-size: 35rpx;
-					font-family: PingFang SC;
 					font-weight: 500;
 					color: #333333;
 				}
@@ -827,14 +822,12 @@
 				.bg-content-b {
 					margin-left: 35rpx;
 					font-size: 32rpx;
-					font-family: PingFang SC;
 					font-weight: 500;
 					color: #333333;
 					margin-top: 32rpx;
 
 					span {
 						font-size: 32rpx;
-						font-family: PingFang SC-Medium, PingFang SC;
 						font-weight: 500;
 						color: #F84221;
 						margin-left: 18rpx;
@@ -844,14 +837,12 @@
 				.bg-content-c {
 					margin-left: 35rpx;
 					font-size: 35rpx;
-					font-family: PingFang SC;
 					font-weight: 500;
 					color: #333333;
 					margin-top: 32rpx;
 
 					span {
 						font-size: 32rpx;
-						font-family: PingFang SC-Medium, PingFang SC;
 						font-weight: 500;
 						color: #F84221;
 						margin-left: 18rpx;
@@ -867,7 +858,6 @@
 					height: 95rpx;
 					line-height: 95rpx;
 					font-size: 32rpx;
-					font-family: PingFang SC;
 					font-weight: 400;
 					color: #999999;
 					margin-left: 121rpx;
@@ -880,7 +870,6 @@
 					line-height: 95rpx;
 					text-align: center;
 					font-size: 32rpx;
-					font-family: PingFang SC-Medium, PingFang SC;
 					font-weight: 500;
 					color: #FFFFFF;
 					background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
@@ -904,7 +893,6 @@
 				.bg-content-a {
 					margin-left: 242rpx;
 					font-size: 35rpx;
-					font-family: PingFang SC;
 					font-weight: 500;
 					color: #333333;
 				}
@@ -917,7 +905,6 @@
 						height: 95rpx;
 						line-height: 95rpx;
 						font-size: 32rpx;
-						font-family: PingFang SC;
 						font-weight: 400;
 						color: #999999;
 						margin-left: 121rpx;
@@ -930,7 +917,6 @@
 						line-height: 95rpx;
 						text-align: center;
 						font-size: 32rpx;
-						font-family: PingFang SC-Medium, PingFang SC;
 						font-weight: 500;
 						color: #FFFFFF;
 						background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
@@ -957,7 +943,6 @@
 				.bg-content-a {
 					margin-left: 242rpx;
 					font-size: 35rpx;
-					font-family: PingFang SC;
 					font-weight: 500;
 					color: #333333;
 				}
@@ -965,14 +950,12 @@
 				.bg-content-b {
 					margin-left: 35rpx;
 					font-size: 32rpx;
-					font-family: PingFang SC;
 					font-weight: 500;
 					color: #333333;
 					margin-top: 32rpx;
 
 					span {
 						font-size: 32rpx;
-						font-family: PingFang SC-Medium, PingFang SC;
 						font-weight: 500;
 						color: #F84221;
 						margin-left: 18rpx;
@@ -982,14 +965,12 @@
 				.bg-content-c {
 					margin-left: 35rpx;
 					font-size: 35rpx;
-					font-family: PingFang SC;
 					font-weight: 500;
 					color: #333333;
 					margin-top: 22rpx;
 
 					span {
 						font-size: 32rpx;
-						font-family: PingFang SC-Medium, PingFang SC;
 						font-weight: 500;
 						color: #F84221;
 						margin-left: 18rpx;
@@ -1017,7 +998,6 @@
 					line-height: 95rpx;
 					text-align: center;
 					font-size: 32rpx;
-					font-family: PingFang SC-Medium, PingFang SC;
 					font-weight: 500;
 					color: #FFFFFF;
 					background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);

pages/commissionedSales/receivedCommission/index.vue

@@ -59,22 +59,26 @@
 							<view class="content-two_oneq" v-if="item.mer_status==1">
 								<view class="contentgn">
 									<block v-if="item.entrust_order_id>0&&item.mer_status==1">
-                     <view class="contentgn_a" v-if="item.entrust_finish==0" style="margin-left: 10rpx;" @click="closingorder(item)">
+										<view class="contentgn_a" v-if="item.entrust_finish==0"
+											style="margin-left: 10rpx;" @click="closingorder(item)">
 											申请结束
 										</view>
-                   	<view class="contentgn_a" v-else-if="item.entrust_finish==1" style="margin-left: 10rpx; color: #20A162;">
+										<view class="contentgn_a" v-else-if="item.entrust_finish==1"
+											style="margin-left: 10rpx; color: #20A162;">
 											已结束
 										</view>
-                     <view class="contentgn_a" v-else-if="item.entrust_finish==2" @click="closingorder(item)" style="margin-left: 10rpx;">
+										<view class="contentgn_a" v-else-if="item.entrust_finish==2"
+											@click="closingorder(item)" style="margin-left: 10rpx;">
 											被拒绝
 										</view>
-                     <view class="contentgn_a" v-else-if="item.entrust_finish==3" style="margin-left: 10rpx; color: #FE9A10;">
+										<view class="contentgn_a" v-else-if="item.entrust_finish==3"
+											style="margin-left: 10rpx; color: #FE9A10;">
 											申请中
 										</view>
 										<span></span>
 									</block>
-               		<view class="contentgn_a" v-if="item.entrust_order_id==0" style="margin-left: 10rpx;"
+									<view class="contentgn_a" v-if="item.entrust_order_id==0"
-               			@click="order(item)">
+										style="margin-left: 10rpx;" @click="order(item)">
 										去下单
 									</view>
 									<span v-if="item.entrust_order_id==0"></span>
@@ -120,19 +124,19 @@
 							<view class="bg-content-a">
 								委托申请处理
 							</view>
-              <view class="bg-content-d" >
+							<view class="bg-content-d">
 								委托方: <span>{{obj.mer_info.mer_name}}</span>
 							</view>
 							<block v-if="obj.mer_info.credit_buy">
-                <view class="bg-content-b" >
+								<view class="bg-content-b">
 									结算周期: <span>{{obj.mer_info.settle_cycle}}天</span>
 								</view>
-                <view class="bg-content-c" >
+								<view class="bg-content-c">
 									利息比例: <span>{{obj.mer_info.interest_rate}}%</span>
 								</view>
 							</block>
 							<block v-else>
-                <view class="bg-content-b" >
+								<view class="bg-content-b">
 									该商户暂不支持先货后款
 								</view>
 								<view style="height: 60rpx;"></view>
@@ -531,7 +535,6 @@
 
 				.txt-b-a {
 					font-size: 32rpx;
-					font-family: PingFang SC;
 					font-weight: 500;
 					color: #333333;
 				}
@@ -550,7 +553,6 @@
 
 					.txt-b-b {
 						font-size: 28rpx;
-						font-family: PingFang SC;
 						font-weight: 400;
 						color: #333333
 					}
@@ -558,20 +560,23 @@
 
 			}
 
-      .content-text{
+			.content-text {
 				flex: 1;
 				display: flex;
 				flex-direction: column;
 				justify-content: space-between;
-        .text-bottom{
+
+				.text-bottom {
 					display: flex;
 					justify-content: space-between;
 				}
-        .one-txt-a{
+
+				.one-txt-a {
 					flex: 1;
 					font-size: 30rpx;
 					display: -webkit-box;
-          -webkit-line-clamp: 2; /* 限制为三行 */
+					-webkit-line-clamp: 2;
+					/* 限制为三行 */
 					-webkit-box-orient: vertical;
 					overflow: hidden;
 					text-overflow: ellipsis;
@@ -624,7 +629,6 @@
 
 				.contentgn_a {
 					font-size: 32rpx;
-					font-family: PingFang SC;
 					font-weight: 400;
 					color: #F84221;
 					margin-right: 10rpx;
@@ -642,7 +646,6 @@
 
 				.contentgn_b {
 					font-size: 32rpx;
-					font-family: PingFang SC;
 					font-weight: 400;
 					color: #999999;
 					margin-left: 10rpx;
@@ -698,7 +701,6 @@
 
 				.contentgn_a {
 					font-size: 32rpx;
-					font-family: PingFang SC;
 					font-weight: 400;
 					color: #F84221;
 					margin-right: 10rpx;
@@ -716,7 +718,6 @@
 
 				.contentgn_b {
 					font-size: 32rpx;
-					font-family: PingFang SC;
 					font-weight: 400;
 					color: #999999;
 					margin-left: 10rpx;
@@ -757,7 +758,6 @@
 				.bg-content-a {
 					margin-left: 242rpx;
 					font-size: 35rpx;
-					font-family: PingFang SC;
 					font-weight: 500;
 					color: #333333;
 				}
@@ -765,14 +765,12 @@
 				.bg-content-b {
 					margin-left: 35rpx;
 					font-size: 32rpx;
-					font-family: PingFang SC;
 					font-weight: 500;
 					color: #333333;
 					margin-top: 16rpx;
 
 					span {
 						font-size: 32rpx;
-						font-family: PingFang SC-Medium, PingFang SC;
 						font-weight: 500;
 						color: #F84221;
 						margin-left: 18rpx;
@@ -782,30 +780,27 @@
 				.bg-content-c {
 					margin-left: 35rpx;
 					font-size: 35rpx;
-					font-family: PingFang SC;
 					font-weight: 500;
 					color: #333333;
 					margin-top: 16rpx;
 
 					span {
 						font-size: 32rpx;
-						font-family: PingFang SC-Medium, PingFang SC;
 						font-weight: 500;
 						color: #F84221;
 						margin-left: 18rpx;
 					}
 				}
+
 				.bg-content-d {
 					margin-left: 35rpx;
 					font-size: 32rpx;
-        	font-family: PingFang SC;
 					font-weight: 500;
 					color: #333333;
 					margin-top: 16rpx;
 
 					span {
 						font-size: 32rpx;
-        		font-family: PingFang SC-Medium, PingFang SC;
 						font-weight: 500;
 						color: #F84221;
 						margin-left: 18rpx;
@@ -821,7 +816,6 @@
 					height: 95rpx;
 					line-height: 95rpx;
 					font-size: 32rpx;
-					font-family: PingFang SC;
 					font-weight: 400;
 					color: #999999;
 					margin-left: 121rpx;
@@ -834,7 +828,6 @@
 					line-height: 95rpx;
 					text-align: center;
 					font-size: 32rpx;
-					font-family: PingFang SC-Medium, PingFang SC;
 					font-weight: 500;
 					color: #FFFFFF;
 					background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);

pages/index/index.vue

@@ -1,6 +1,5 @@
 <template>
 	<view class="content">
-		<button @click="openDiver">anniu</button>
 		<view class="content-top">
 			<view class="content-tops">
 				<view class="content-top_img" v-if="Object.keys(userInfoData).length>0">
@@ -85,10 +84,11 @@
 					常用工具
 					<view class=""></view>
 				</view>
-				<view class="tools-two"
+				<!-- <view class="tools-two"
 					v-if="isgShow&&userInfoData.mer_info.setting_status==1&&userInfoData.mer_info.type_code=='TypeSupplyChain'">
 					<view class="" v-for="(item,k) in typelistSupplyChain" :key='k' @click="navation(item)">
 						<view class="tools-two-img">
+
 							<image :src="item.image" mode=""></image>
 						</view>
 						<view class="tools-two-title"> {{item.name}}</view>
@@ -98,12 +98,13 @@
 					v-else-if="isgShow&&userInfoData.mer_info.setting_status==1&&userInfoData.mer_info.type_code=='PersonalStore'">
 					<view class="" v-for="(item,k) in typePersonalStoreList" :key='k' @click="navation(item)">
 						<view class="tools-two-img">
+
 							<image :src="item.image" mode=""></image>
 						</view>
 						<view class="tools-two-title"> {{item.name}}</view>
 					</view>
-				</view>
+				</view> -->
-				<view class="tools-two" v-else-if="isgShow&&userInfoData.mer_info.setting_status==1">
+				<view class="tools-two" v-if="isgShow">
 					<view class="" v-for="(item,k) in typelist" :key='k' @click="navation(item)">
 						<view class="tools-two-img " :id="'asas'+k">
 							<image :src="item.image" mode=""></image>
@@ -111,17 +112,15 @@
 						<view class="tools-two-title"> {{item.name}}</view>
 					</view>
 				</view>
-				<view class="tools-two" v-else>
+				<!-- <view class="tools-two" v-else>
 					<view class="" @click="byset">
 						<view class="tools-two-img">
 							<image src="@/static/images/index11.png" mode=""></image>
 						</view>
 						<view class="tools-two-title"> 商家设置</view>
 					</view>
+				</view> -->
 			</view>
-			</view>
-
-
 			<view class="content-list">
 				<view style="width: 100%;background-color: #fff;">
 					<view class="tools-one">
@@ -457,6 +456,7 @@
 		},
 		data() {
 			return {
+				subNVue: '',
 				elInfo: {},
 				isAuto: false, //没有授权的不会自动授权
 				isShowAuth: false, //是否隐藏授权
@@ -850,6 +850,7 @@
 		},
 
 		async onLoad() {
+			this.subNVue = uni.getSubNVueById('concat')
 			this.Fheight = uni.getSystemInfoSync().windowHeight + 'px';
 			await this.$onLaunched;
 			this.list1();
@@ -859,6 +860,7 @@
 				this.loadEndFlag = true;
 			});
 			uni.$on('diverIndexSubEmit', () => {
+				this.subNVue.hide()
 				uni.navigateTo({
 					url: '/pages/product/list/index?diver=1'
 				})
@@ -875,10 +877,34 @@
 			}
 		},
 		onReady() {
+			// if (Boolean(this.$store.state.app.userInfo.service?.mer_id)) {
+			// 	isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id).then(res => {
+			// 		if (res.data == 'true') {
+			// 			let that = this
+			// 			const query = uni.createSelectorQuery().in(this);
+			// 			query
+			// 				.select(".tools-two-img")
+			// 				.boundingClientRect((data) => {
+			// 					let info = JSON.stringify(data)
+			// 					that.elInfo = data
+			// 					// #ifdef APP-PLUS
+			// 					that.openDiver()
+			// 					// #endif
+			// 				})
+			// 				.exec();
+			// 		}
+			// 	})
+			// }
+
+
+		},
+
+		onShow() {
 			if (Boolean(this.$store.state.app.userInfo.service?.mer_id)) {
-				isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id).then(res => {
+				isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id).then(
-					return
+					res => {
-					if (res.data == 'true') {
+						console.log(res.data)
+						if (res.data == 'true' && this.elInfo) {
 							let that = this
 							const query = uni.createSelectorQuery().in(this);
 							query
@@ -895,25 +921,6 @@
 					})
 			}
 
-
-		},
-
-		onShow() {
-
-			if (Boolean(this.$store.state.app.userInfo.service?.mer_id)) {
-				isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id).then(
-					res => {
-						return
-						if (res.data == 'true' && this.elInfo) {
-							console.log('resdaa', res.data)
-							this.openDiver()
-						}
-					})
-			}
-
-
-
-
 			if (this.loadEndFlag) {
 				this.getUserInfo();
 				this.codelist();
@@ -925,9 +932,22 @@
 			this.$bus.$off('value-updated')
 		},
 		methods: {
+			test1() {
+				isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id).then(res => {
+					console.log(res, 'res')
+				})
+
+			},
+
+			test2() {
+				isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id, {
+					done: 1
+				}).then(res => {
+					console.log(res, 'res')
+				})
+			},
 			openDiver() {
-				const subNVue = uni.getSubNVueById('concat')
+				this.subNVue.show('zoom-out', 300)
-				subNVue.show('zoom-out', 300)
 				uni.$emit('diverIndexEmit', this.elInfo);
 			},
 			// 提现页面

pages/index/subnvue/concat.nvue

@@ -24,6 +24,9 @@
 </template>
 
 <script>
+	import {
+		isNewMer
+	} from '@/api/user.js';
 	export default {
 		data() {
 			return {
@@ -37,16 +40,17 @@
 		},
 		methods: {
 			jump() {
-
+				isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id, {
+					done: 1
+				}).then(res => {
+					console.log(res, 'res')
+				})
 				this.subNVue.hide('zoom-in', 300, )
-
 			},
 			next() {
-				this.subNVue = uni.getSubNVueById('concat')
+				// this.subNVue = uni.getSubNVueById('concat')
-				this.subNVue.hide('zoom-in', 300, )
+				// this.subNVue.hide('zoom-in', 300, )
-				setTimeout(() => {
 				uni.$emit('diverIndexSubEmit');
-				}, 300)
 
 			}
 		},

pages/product/addGood/addGood.vue

@@ -487,7 +487,6 @@
 		box-sizing: border-box;
 		padding: 20rpx;
 		padding-bottom: 200rpx;
-		font-family: PingFangRegular;
 
 
 	}

pages/product/addGoodDetail/addGoodDetail.vue

@@ -227,7 +227,7 @@
 					<view class="">
 						温馨提示
 					</view>
-					<view class="" style="font-family: PingFangFamily;font-size: 36rpx;">
+					<view class="" style="font-size: 36rpx;">
 						发布中断可能导致商机流失
 					</view>
 					<view class="" style="font-size: 26rpx;color: #777777;">
@@ -794,7 +794,6 @@
 		background-color: #F1F1F1;
 		box-sizing: border-box;
 		padding-bottom: 280rpx;
-		font-family: PingFangRegular;
 		padding: 20rpx 20rpx 200rpx 20rpx;
 
 

pages/product/addGoodDetail/goodsAttr.vue

@@ -378,13 +378,9 @@
 </script>
 
 <style lang='scss'>
-	.MediumFont {
+	.MediumFont {}
-		font-family: PingFangFamily;
-	}
 
-	.RegularFont {
+	.RegularFont {}
-		font-family: PingFangRegular;
-	}
 
 	.content {
 		box-sizing: border-box;
@@ -393,7 +389,6 @@
 		min-height: 100vh;
 		position: relative;
 		font-size: 28rpx;
-		font-family: PingFangFamily;
 	}
 
 	.label-cls {

pages/product/addGoodDetail/goodsPrice.vue

@@ -5,7 +5,7 @@
 		</view>
 		<view class="card" v-for="(item,index) in attrValue">
 			<view class="card-head card-li">
-				<text style="font-size: 32rpx;font-family: PingFangFamily;">规格{{index+1}}</text>
+				<text style="font-size: 32rpx;">规格{{index+1}}</text>
 				<view class="" style="width: 300rpx;">
 					<!-- {{formData.attr}} -->
 					<!-- <u--input placeholder="请输入规格名称" inputAlign='right' v-model="formData.attr[index].value"></u--input> -->
@@ -331,9 +331,7 @@
 		min-height: 100vh;
 		position: relative;
 		font-size: 28rpx;
-		font-family: PingFangRegular;
 		padding-bottom: 200rpx;
-		/* font-family: PingFangFamily; */
 
 
 		.card {

pages/product/addGoodDetail/goodsSearch.vue

@@ -115,13 +115,9 @@
 </script>
 
 <style lang='scss'>
-	.MediumFont {
+	.MediumFont {}
-		font-family: PingFangFamily;
-	}
 
-	.RegularFont {
+	.RegularFont {}
-		font-family: PingFangRegular;
-	}
 
 	.content {
 		box-sizing: border-box;
@@ -129,7 +125,6 @@
 		min-height: 100vh;
 		position: relative;
 		font-size: 28rpx;
-		font-family: PingFangRegular;
 
 		.types {
 			display: flex;

pages/product/addGoodDetail/goodsType.vue

@@ -119,7 +119,6 @@
 		background-color: white;
 		min-height: 100vh;
 		position: relative;
-		font-family: PingFangRegular;
 
 		.lines {
 			height: 16px;

pages/product/list/subnvue/concat.nvue

@@ -50,7 +50,7 @@
 			next() {
 				this.subNVue.hide('zoom-in', 300, )
 				isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id, {
-					done: true
+					done: 1
 				}).then(res => {
 					console.log('res', res)
 				})

static/css/base.css

@@ -413,13 +413,3 @@ checkbox .uni-checkbox-input.uni-checkbox-input-checked::before {
 	height: 80rpx;
 	overflow: hidden
 }
-
-@font-face {
-	font-family: PingFangFamily;
-	src: url('/static/font/PingFangMedium.ttf');
-}
-
-@font-face {
-	font-family: PingFangRegular;
-	src: url('/static/font/PingFangRegular.ttf');
-}