库存显示红色

ghsApp/src/admin/item/components/ItemStock.vue

@@ -5,12 +5,12 @@
 		</view>
 		<navigator :url="`/admin/item/detail?id=${info.id}`" class="cmd-info_bx active">
 			<view class="tit">{{ info.itemName || "" }}</view>
-			<view class="kc">{{ info.rank || "" }}级</view>
+			<view class="kc">￥{{ info.price }}</view>
 			<view class="num-open_bx">
-				<view class="price" v-if="isPrice">￥{{ info.price }}</view>
+
 				<template>
 					<view class="open-bx">
-						库存 <text style="margin-left: 10rpx;font-size: 20rpx">{{ info.stock }}</text>
+						库存 <text style="margin-left: 10rpx;font-size: 23rpx">{{ info.stock }}</text>
 					</view>
 				</template>
 			</view>
@@ -98,8 +98,8 @@ export default {
 		}
 
 		& .tit {
-			font-size: 28px;
-			font-weight: 400;
+			font-size: 30px;
+			font-weight: bold;
 			color: #333333;
 			padding-top: 10px;
 		}

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

@@ -18,7 +18,8 @@
 						</text>
 						<i class="iconfont iconzeng" :class="addAnimationData?'animation':''" @click.stop="addEvents"></i>
 					</view>
-					<text style="padding-right: 55rpx">还剩 {{ info.stock }}</text>
+					<text v-if="Number(info.stock) > Number(info.stockWarning)" style="padding-right: 55rpx">还剩 {{ info.stock }}</text>
+					<text v-else style="padding-right: 55rpx;color:red;font-weight:450;">还剩 {{ info.stock }}</text>
 				</view>
 			</view>
 			<view class="num-open_bx flex-space" v-if="type == COMMODITY_TYPE.CHANGE">

ghsApp/src/pagesClient/member/detail.vue

@@ -51,6 +51,7 @@
             </view>
             <view>
               <i @click="callUp" class="iconfont icondianhua1"></i>
+              <i @click.stop="navigate(userInfo.lat,userInfo.long,userInfo.customName)" class="iconfont icondianhua" style="font-size:47rpx;margin-left:16px;margin-right:9rpx;color:#3385ff;"></i>
             </view>
           </view>
       </view>
@@ -62,13 +63,6 @@
             <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="pageTo({ url: '/admin/clear/customList',query: {customId: userInfo.id}})">
               <div class="tui-title">历史帐单</div>
             </tui-list-cell>
-            <tui-list-cell class="line-cell" :hover="false">
-              <div class="tui-title">拉黑</div>
-              <div class="switch_bx">
-                <text></text>
-                <switch :checked="form.black == 1 ? false : true" @change="blackChangeFn" style="transform: scale(0.8,0.8)" />
-              </div>
-            </tui-list-cell>
             <tui-list-cell class="line-cell" :hover="false">
               <div class="tui-title">允许欠款</div>
               <div class="switch_bx">
@@ -81,6 +75,15 @@
               <input v-model="debtLimit" @click="debtLimit=''" placeholder-class="phcolor" class="tui-input" confirm-type="go" placeholder="请填写" type="digit" style="width:48%;border:1px solid #ddd;margin-right:15rpx;height:52rpx;" />
               <button class="admin-button-com blue mini-btn" @tap="amendMoney">确定</button>
 						</tui-list-cell>
+
+            <tui-list-cell class="line-cell" :hover="false">
+              <div class="tui-title">拉黑</div>
+              <div class="switch_bx">
+                <text></text>
+                <switch :checked="form.black == 1 ? false : true" @change="blackChangeFn" style="transform: scale(0.8,0.8)" />
+              </div>
+            </tui-list-cell>
+
         </view>
       </view>
     </templete>
@@ -116,6 +119,19 @@ export default {
   computed: {},
   onLoad() {},
   methods: {
+		navigate(latitude, longitude, address) {   
+			// 将经纬度转换成Number
+			let latituded = Number(latitude);
+			let longituded = Number(longitude);					
+			uni.openLocation({
+				latitude: latituded,
+				longitude: longituded,
+				address: address,
+				success: function() {
+					console.log('success');
+				}
+			});
+		},
 		//修改欠款额度
   	amendMoney(){
       updateDebtLimit({ id: this.option.id,debtLimit:this.debtLimit }).then(res => {

ghsApp/src/pagesOrder/detail.vue

@@ -20,7 +20,7 @@
 				</view>
 				<view>
 				<i @click.stop="callUp(detailInfo.customMobile)" class="iconfont icondianhua1"></i>
-				<i @click.stop="navigate(detailInfo.lat,detailInfo.long,detailInfo.customName)" class="iconfont icondianhua" style="font-size:52rpx;margin-left:13px;margin-right:8rpx;color:#3385ff;"></i>
+				<i @click.stop="navigate(detailInfo.lat,detailInfo.long,detailInfo.customName)" class="iconfont icondianhua" style="font-size:53rpx;margin-left:15px;margin-right:9rpx;color:#3385ff;"></i>
 				</view>
 			</view>
 			<view class="title">