改成单价

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

@@ -12,12 +12,15 @@
 				<text v-if="info.variety && info.variety ==1" class="show-color">
 				</text>
 			</view>
-			<view class="kc">￥{{ parseFloat(info.price) }} <text style="margin-left:25upx;color:#555555;font-weight:normal;">￥{{ parseFloat(info.skPrice) }}</text></view>
+			<view class="kc">￥{{ parseFloat(info.price) }} 
+				<text style="margin-left:25upx;color:#555555;font-weight:normal;">￥{{ parseFloat(info.skPrice) }}</text>
+				<text style="margin-left:32upx;color:#999;font-size:23upx;font-weight:normal;">成本 ￥{{ info.cost?parseFloat(info.cost):0 }}</text>
+			</view>
 			<view class="num-open_bx">
 				<template>
 					<view class="open-bx">
-						还剩 <text style="font-size: 23upx;margin-left:8upx;">{{ parseFloat(info.stock) }}</text>
-						<text style="margin-left:30upx;font-size: 23upx;display:inline-block;color:#999;">销量 {{ parseFloat(info.actualSold) }}</text>
+						还剩 <text style="font-size:23upx;margin-left:8upx;">{{ info.stock?parseFloat(info.stock):0 }}</text>
+						<text style="margin-left:15upx;font-size:23upx;display:inline-block;color:#999;">销量 {{ info.actualSold?parseFloat(info.actualSold):0 }}</text>
 					</view>
 				</template>
 			</view>

ghsApp/src/admin/order/statBook.vue

@@ -14,14 +14,13 @@
 		<scroll-view scroll-y scroll-with-animation class="main-view">
 			<view class="space-view ex-table">
 				<t-table :headerBackgroundColor="'#F0F2F6'">
-					<t-tr header><t-th>日期</t-th><t-th>花材</t-th><t-th>数量</t-th><t-th>明细</t-th></t-tr>
+					<t-tr header><t-th>日期</t-th><t-th>花材</t-th><t-th>数量</t-th></t-tr>
 					<template v-if="!$util.isEmpty(profile)">
 						<view v-for="(item, index) in profile" :key="index" @click="goDetail(item)">
 							<t-tr>
-								<t-td><view>{{item.time.substr(4,4)}}</view></t-td>
-								<t-td><view>{{item.name}}</view></t-td>
-								<t-td><view>{{item.num}}</view></t-td>
-								<t-td><view><text style="color:#3385FF">查看</text></view></t-td>
+								<t-td><view style="color:#333333;font-size:30upx;">{{item.time.substr(4,4)}}</view></t-td>
+								<t-td><view style="color:#333333;font-size:30upx;">{{item.name}}</view></t-td>
+								<t-td><view style="color:#333333;font-size:30upx;">{{item.num}}</view></t-td>
 							</t-tr>
 						</view>
 					</template>

ghsApp/src/admin/order/statKhBook.vue

@@ -18,9 +18,9 @@
 						<template v-if="!$util.isEmpty(profile)">
 							<view v-for="(item, index) in profile" :key="index" @click="goDetail(item)">
 								<t-tr>
-									<t-td><view>{{item.name}}</view></t-td>
-									<t-td><view>{{parseFloat(item.num)}}</view></t-td>
-									<t-td><view>{{parseFloat(item.amount)}}</view></t-td>
+									<t-td><view style="color:#333333;font-size:30upx;">{{item.name}}</view></t-td>
+									<t-td><view style="color:#333333;font-size:30upx;">{{parseFloat(item.num)}}</view></t-td>
+									<t-td><view style="color:#333333;font-size:30upx;">{{parseFloat(item.amount)}}</view></t-td>
 								</t-tr>
 							</view>
 						</template>

ghsApp/src/admin/shop/add.vue

@@ -87,6 +87,13 @@
 					<input v-model="form.packCost" @focus="form.packCost=''" placeholder-class="phcolor" class="tui-input" name="packCost" placeholder="打包费" type="digit" />
 				</tui-list-cell>
 
+				<tui-list-cell class="line-cell" :hover="false">
+					<view class="tui-title">预售</view>
+					<view>
+						<switch style="transform:scale(0.7,0.7)" :checked="form.presell == 0 ? false : true" @change="presellChange" /> {{form.presell==0 ? '关闭' : '开启'}}
+					</view>
+				</tui-list-cell>
+
 				<tui-list-cell class="line-cell" :hover="false">
 					<view class="tui-title">客户欠款</view>
 					<view>
@@ -128,7 +135,7 @@ import { updateShop as update, addShop as add } from '@/api/shop'
 import {mapActions} from "vuex";
 import {getDetail} from "@/api/shop"
 export default {
-	name: 'staff-add',
+	name: 'add',
 	components: {
 		TuiListCell,
 		AppAvatarModule,
@@ -159,7 +166,8 @@ export default {
 				packCost:0,
 				img: [],
 				allowDebt:0,
-				allowDebtAmount:5000
+				allowDebtAmount:5000,
+				presell:0
 			},
 			showRegion: false,
 			region: {
@@ -223,6 +231,9 @@ export default {
 				})
 			}
 		},
+		presellChange(e){
+			this.form.presell = e.target.value ? 1 : 0
+		},
 		allowDebtChange(e){
 			this.form.allowDebt = e.target.value ? 1 : 0
 		},

ghsApp/src/admin/shop/list.vue

@@ -3,28 +3,15 @@
 		<div class="list-wrap staff-list">
 			<block v-if="!$util.isEmpty(list.data)">
 				<div class="list" v-for="(item, index) in list.data" :key="index">
-					<div class="list-avatar">
-						<app-avatar-module :src="item.avatar" :width="90" />
-					</div>
-					<div class="list-det">
+					<div class="list-det" @click.stop="toModiyFn(item)">
 						<div class="list-det-left">
 							<div>
 								<span class="staff-name">{{ item.shopName }}</span>
 								<span>{{ item.telephone }}</span>
 							</div>
-							<div class="flex-center">
-								<div class="status-list">
-									<span class v-if="item.gatheringCode" @click="downQrCodeFn(item, index)">收款码下载</span>
-									<span v-else></span>
-								</div>
-								<div class="status-list">
-									<span class v-if="item.gatheringCode" @click="downMemberCodeFn(item, index)">会员码下载</span>
-									<span v-else></span>
-								</div>
-							</div>
 						</div>
 						<div class="list-det-right">
-							<div @click="toModiyFn(item)">
+							<div @click.stop="toModiyFn(item)">
 								<i class="iconfont iconbianji"></i>
 							</div>
 							<!-- 删除 -->

ghsApp/src/pagesOrder/arrival.vue

@@ -18,7 +18,7 @@
 									<text class="item-type"></text>
 									<view class="item-count">
 										<input type="number" class="num" v-model="s.xhNum" placeholder="到货数量" />
-										<text>¥{{s.xhPrePrice?parseFloat(s.xhPrePrice):0}}</text>
+										<text>¥{{s.xhPreUnitPrice?parseFloat(s.xhPreUnitPrice):0}}</text>
 									</view>
 								</view>
 							</view>
@@ -97,7 +97,7 @@ export default {
 			let price = 0
 			if (this.detailInfo && this.detailInfo.product) {
 				for (const item of this.detailInfo.product) {
-					let current = Number(item.xhPrePrice)*Number(item.xhNum)
+					let current = Number(item.xhPreUnitPrice)*Number(item.xhNum)
 					price = Number(price)+Number(current)
 					price = parseFloat(price.toFixed(2))
 				}
@@ -131,7 +131,7 @@ export default {
 			if (this.detailInfo && this.detailInfo.product) {
 				for (const item of this.detailInfo.product) {
 						let name = item.name
-						if(item.xhPrePrice.length <= 0){
+						if(item.xhPreUnitPrice.length <= 0){
 							this.$msg(name+' 没有价格')
 							hasError = true;
 							break;
@@ -148,7 +148,7 @@ export default {
 							hasError = true;
 							break;
 						}
-						let price = item.xhPrePrice ? Number(item.xhPrePrice) : 0
+						let price = item.xhPreUnitPrice ? Number(item.xhPreUnitPrice) : 0
 						let productId = item.productId || 0
 						let unitType = 0
 						product = [...product,{productId,price,num,unitType}]