app 更新

ghsApp/src/admin/billing/customerPlace.vue

@@ -9,7 +9,7 @@
 		<view class="input-wrap">
 			<app-search-module
 				v-model="py"
-				placeholder="输入字母搜索"
+				placeholder="输英文字母搜索"
 				@search="searchFn"
 			/>
 		</view>

ghsApp/src/admin/billing/index.vue

@@ -2,7 +2,7 @@
 	<view class="billing_box_bg">
 		<view class="input-wrap" >
 			<view class="search-bar">
-				<app-search-module v-model="py" placeholder="输入字母搜索" @input="searchFn" />
+				<app-search-module v-model="py" placeholder="输英文字母搜索" @input="searchFn" />
 			</view>
 			<view style="float:right">
 				<button class="admin-button-com middle blue" @click="removeMemory(option.customId)">清除花材</button>

ghsApp/src/admin/billing/priceChange.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="billing_box_bg">
     <view class="input-wrap">
-      <app-search-module v-model="py" placeholder="输入字母搜索" @input="searchFnContrapose" />
+      <app-search-module v-model="py" placeholder="输英文字母搜索" @input="searchFnContrapose" />
     </view>
     <view class="scroll-middle_bx">
         <!--内容部分 start -->

ghsApp/src/admin/breakage/index.vue

@@ -2,7 +2,7 @@
 	<view class="billing_box_bg">
 		<view class="input-wrap" >
 			<view class="search-bar">
-				<app-search-module v-model="py" placeholder="输入字母搜索" @input="searchFn" />
+				<app-search-module v-model="py" placeholder="输英文字母搜索" @input="searchFn" />
 			</view>
 			<view style="float:right">
 				<button class="admin-button-com middle blue" @click="removeMemory(0)">清除花材</button>

ghsApp/src/admin/changePrice/list.vue

@@ -3,7 +3,7 @@
     <app-tabs :tabs="tabs" :currentTab="tabIndex" @change="change" itemWidth="50%"/>
     <view class="input-wrap">
 			<view class="search-bar">
-				<app-search-module v-model="py" placeholder="输入字母搜索" @input="searchFn"/>
+				<app-search-module v-model="py" placeholder="输英文字母搜索" @input="searchFn"/>
 			</view>
 			<view style="padding:0 0rpx 0 20upx;" >
 				<button class="admin-button-com middle blue" @click="downloadTable()">价格表</button>

ghsApp/src/admin/custom/selectCustom.vue

@@ -2,7 +2,7 @@
   <div class="app-main app-content">
     <view class="input-wrap_box">
       <view>
-        <AppSearchModule placeholder="输入字母搜索，如花朵朵搜索hdd" @input="searchFn"/>
+        <AppSearchModule placeholder="输英文字母搜索，花朵朵填hdd" @input="searchFn"/>
       </view>
     </view>
     <block v-if="!$util.isEmpty(list.data)">

ghsApp/src/admin/home/member.vue

@@ -2,7 +2,7 @@
   <div class="app-main app-content">
     <view class="input-wrap_box">
       <view>
-        <AppSearchModule placeholder="输入字母搜索，如花朵朵搜索hdd" @input="searchFn"/>
+        <AppSearchModule placeholder="输英文字母搜索，花朵朵填hdd" @input="searchFn"/>
       </view>
     </view>
     <view class="app-tabs">
@@ -308,8 +308,8 @@ export default {
   align-items: center;
 }
 .user_tag {
-  border: 1px solid #cccccc;
-  padding: 5px 12px 5px 12upx;
+  border: 1upx solid #cccccc;
+  padding: 5upx 12upx 5upx 12upx;
   border-radius: 25upx;
   color: #bbbbbb;
   margin-right: 10upx;

ghsApp/src/admin/home/order.vue

@@ -9,7 +9,7 @@
       </view>
 
       <view>
-        <AppSearchModule placeholder="输入字母搜索" @input="searchFn"/>
+        <AppSearchModule placeholder="输英文字母搜索" @input="searchFn"/>
       </view>
 
       <view class="select-dn_bx">

ghsApp/src/admin/home/workbench.vue

@@ -60,7 +60,7 @@
 			<!-- 使用手册 -->
 			<view v-if="showBook == 1" style="text-align:center;position:relative;" @click="pageTo({ url: '/admin/book/index'})">
 				<view @click.stop="closeBook" style="position:absolute;right:38upx;top:8upx;"><image style="width:38upx;" :src="`${constant.imgUrl}/book/close1.png`" mode="widthFix"></image></view>
-				<image style="border:4rpx solid #DDDDDD;margin:0 auto;width:695upx;border-radius:15upx;" :src="`${constant.imgUrl}/book/book5.png`" mode="widthFix"></image>
+				<image style="border:4upx solid #DDDDDD;margin:0 auto;width:695upx;border-radius:15upx;" :src="`${constant.imgUrl}/book/book5.png`" mode="widthFix"></image>
 			</view>
 
 			<!-- 小按钮 -->
@@ -234,10 +234,13 @@ export default {
 			})
 		},
 		skKd(){
+			console.log(66666)
+			console.log(this.myShopInfo)
 			console.log(this.myShopInfo.skCustomId)
 			console.log(this.skCustomId)
-			console.log(7777)
+			console.log(777777)
 			if((this.myShopInfo.skCustomId && this.myShopInfo.skCustomId > 0) || this.skCustomId > 0){
+
 				let currentId = 0;
 				if(this.skCustomId > 0){
 					currentId = this.skCustomId
@@ -344,7 +347,7 @@ export default {
 }
 // 用户信息
 .user-wrap {
-	padding: 20px 30px 34px 30upx;
+	padding: 20upx 30upx 34upx 30upx;
 	color: #fff;
 	text-align: center;
 	background-image: url("../../static/images/admin/bg.png");
@@ -360,7 +363,7 @@ export default {
 				padding:0;
 				line-height: auto;
 				background-color: transparent;
-				border: 1px solid #ffffff;
+				border: 1upx solid #ffffff;
 				border-radius: 22upx;
 				padding: 10upx 17upx!important;
 				font-size: 24upx;
@@ -400,8 +403,8 @@ export default {
 .news-wrap {
 	.news-list {
 		@include disFlex(center, space-between);
-		padding: 30px 24px 30px 30upx;
-		border-bottom: 1px solid $borderColor;
+		padding: 30upx 24upx 30upx 30upx;
+		border-bottom: 1upx solid $borderColor;
 		font-size: 26upx;
 		color: $fontColor2;
 		&:active {
@@ -433,8 +436,8 @@ export default {
 .total-wrap,
 .order-wrap {
 	.total-tit {
-		padding: 18px 0 18px 20upx;
-		border-bottom: 1px solid $borderColor;
+		padding: 18upx 0 18upx 20upx;
+		border-bottom: 1upx solid $borderColor;
 		font-weight: 600;
 		font-size: 24upx;
 		color: #333333;
@@ -442,12 +445,12 @@ export default {
 	.total-blo {
 		@include disFlex(center, space-between);
 		flex-wrap: wrap;
-		padding: 30px 0 40upx;
+		padding: 30upx 0 40upx;
 		.total-list {
 			width: 33%;
 			text-align: center;
-			margin: 20px 0upx;
-			border-right: 1px solid $borderColor;
+			margin: 20upx 0upx;
+			border-right: 1upx solid $borderColor;
 			.list-num {
 				margin-bottom: 8upx;
 				font-size: 36upx;
@@ -465,11 +468,11 @@ export default {
 .tabs-head_bx {
 	display: flex;
 	align-items: center;
-	padding: 20px 15px 10px 15upx;
+	padding: 20upx 15upx 10upx 15upx;
 }
 // tabs
 .tabs-wrap {
-	padding: 20px 10upx;
+	padding: 20upx 10upx;
 	@include disFlex(center, flex-start);
 	flex-wrap: wrap;
 	.tabs-list {

ghsApp/src/admin/ptItem/itemList.vue

@@ -2,7 +2,7 @@
 	<view class="billing_box_bg">
     <view class="input-wrap">
 			<view class="search-bar">
-				<app-search-module v-model="py" placeholder="输入字母搜索" @input="searchFnContrapose"/>
+				<app-search-module v-model="py" placeholder="输英文字母搜索" @input="searchFnContrapose"/>
 			</view>
 			<view style="padding:0 0rpx 0 20upx;" >
 				<button class="admin-button-com middle blue" @click="pageTo({ url: '/admin/item/detail',type:2 })">添加花材</button>

ghsApp/src/admin/statistics/cgStat.vue

@@ -3,7 +3,7 @@
 
 		<view class="input-wrap_box">
 		<view>
-			<AppSearchModule placeholder="输入字母搜索" @input="searchFn"/>
+			<AppSearchModule placeholder="输英文字母搜索" @input="searchFn"/>
 		</view>
 		</view>
 

ghsApp/src/admin/statistics/customSale.vue

@@ -3,7 +3,7 @@
 
 		<view class="input-wrap_box">
 		<view>
-			<AppSearchModule placeholder="输入字母搜索" @input="searchFn"/>
+			<AppSearchModule placeholder="输英文字母搜索" @input="searchFn"/>
 		</view>
 		</view>
 

ghsApp/src/admin/statistics/productSale.vue

@@ -3,7 +3,7 @@
 
     <view class="input-wrap_box">
       <view>
-        <AppSearchModule placeholder="输入字母搜索" @input="searchFn"/>
+        <AppSearchModule placeholder="输英文字母搜索" @input="searchFn"/>
       </view>
     </view>
 

ghsApp/src/components/module/app-search.vue

@@ -141,6 +141,7 @@ export default {
 				height: 100%;
 				font-size: 30upx !important;
 				text-align: left;
+				line-height: 90upx;
 			}
 			.placeholder {
 				color: #ccc;

ghsApp/src/pagesOrder/detail.vue

@@ -479,9 +479,7 @@ export default {
 			});
 		},
 		callUp(mobile) {
-			uni.makePhoneCall({
-				phoneNumber: mobile
-			});
+			this.$util.callUp(mobile)
 		},
 		async init() {
 			try {

ghsApp/src/pagesPurchase/add.vue

@@ -2,7 +2,7 @@
 	<view class="billing_box_bg">
 		<view class="input-wrap">
 			<view class="search-bar">
-				<app-search-module v-model="py" placeholder="输入字母搜索" @input="searchFn"/>
+				<app-search-module v-model="py" placeholder="输英文字母搜索" @input="searchFn"/>
 			</view>
 			<view style="padding:0 0rpx 0 20upx;" >
 				<button class="admin-button-com middle blue" @click="pageTo({ url: '/admin/ptItem/itemList' })">添加花材</button>

ghsApp/src/pagesStorehouse/allot/exSelect.vue

@@ -3,7 +3,7 @@
 		<view class="input-wrap">
 			<app-search-module
 				v-model="py"
-				placeholder="输入字母搜索，如艾莎 as"
+				placeholder="输英文字母搜索，如艾莎 as"
 				@input="searchFn"
 			/>
 		</view>

ghsApp/src/pagesStorehouse/stockWarn/manage.vue

@@ -2,7 +2,7 @@
 	<view class="billing_box_bg">
     <view class="input-wrap">
 			<view class="search-bar">
-				<app-search-module v-model="py" placeholder="输入字母搜索" @input="searchFnContrapose"/>
+				<app-search-module v-model="py" placeholder="输英文字母搜索" @input="searchFnContrapose"/>
 			</view>
 		</view>
 		<view class="scroll-middle_bx">

ghsApp/src/utils/util.js

@@ -285,6 +285,17 @@ export const isLogin = () => {
 	return false;
 };
 
+export const callUp = (mobile) =>{
+	//#ifdef MP-WEIXIN
+	uni.makePhoneCall({
+		phoneNumber: mobile
+	});
+	//#endif
+	//#ifdef APP-PLUS
+	plus.device.dial(mobile, true);
+	//#endif
+}
+
 //没有库存时的语音播放 shish
 export const noStockRemind = () =>{
 	//没有库存声音提醒
@@ -337,5 +348,6 @@ export default {
 	unique,
 	isMoney,
 	isNumber,
-	noStockRemind
+	noStockRemind,
+	callUp
 };