Просмотр исходного кода

Merge branch 'zhongqi-delivery' of git.huaml.com:zhh/front-end into zhongqi-delivery

shizhongqi 8 месяцев назад
Родитель
Сommit
aa0db18a5b

+ 1 - 16
ghsApp/src/admin/home/components/OrderItem.vue

@@ -2,22 +2,7 @@
   <view>
     <view @click="pageTo({ url: '/pagesOrder/detail?id=' + item.id })">
       <view class="order-top_box">
-        <image
-          class="code-pay-img"
-          v-if="currentStatus == 1 && item.book == 0"
-          @click.stop="
-            pageTo({
-              url: '/admin/billing/toPay',
-              query: {
-                orderId: item.id,
-                orderSn: item.orderSn,
-                actPrice: item.actPrice
-              }
-            })
-          "
-          mode="widthFix"
-          :src="`${constant.imgUrl}/icon/codePay8.png`"
-        ></image>
+        <image class="code-pay-img" v-if="currentStatus == 1 && item.book == 0" @click.stop="pageTo({ url:'/admin/billing/toPay',query:{orderId:item.id,orderSn:item.orderSn,actPrice:item.actPrice}})" mode="widthFix" :src="`${constant.imgUrl}/icon/codePay8.png`"></image>
 
         <image class="avatar" mode="aspectFit" :src="item.customAvatarUrl"></image>
         <view class="tit"> {{ item.customName || '' }}</view>

+ 91 - 72
ghsApp/src/admin/itemClass/list.vue

@@ -1,76 +1,88 @@
 <template>
-	<div class="app-content" @click="globalClick">
-		<div class="list-wrap">
+	<view class="app-content" @click="globalClick">
+		<view class="list-wrap">
 			<block v-if="!$util.isEmpty(list.data)">
-				<div class="list" v-for="(item, index) in list.data" :key="index">
-					<div class="list-index">{{ item.id }}</div>
-					<div class="list-det" @click="editItem(item)">
-						<div class="app-size-28 app-color-0" style="font-size:28upx;font-weight:bold;color:#333333;">
+				<view class="list" v-for="(item, index) in list.data" :key="index">
+					<view class="list-index">
+						<image  :src="item.smallCover" style="width:80upx;height:80upx;" mode="widthFix"></image>
+					</view>
+					<view class="list-det" @click="editItem(item)">
+						<view class="app-size-28 app-color-0" style="font-size:28upx;font-weight:bold;color:#333333;">
 						{{ item.name || '' }}
-						</div>
-						<div class="list-operate">
-							<div class="operate-det" style="color:#333333;">
+						</view>
+						<view class="list-operate">
+							<view class="operate-det" style="color:#333333;">
 								<span>序号 {{ item.inTurn }}</span>
-							</div>
+							</view>
 							<view class="operate-icon">
 								<i class="iconfont iconbianji" style="font-size:38upx;"></i>
 							</view>
 							<view class="operate-icon" @click.stop="delClass(item)">
 								<i class="iconfont iconshanchu1" style="font-size:38upx;"></i>
 							</view>
-						</div>
-					</div>
-				</div>
-				<operate-module v-if="operateShow" :top="operateTop" :right="30" @clickFn="operateList" :btnData="btnData" />
+						</view>
+					</view>
+				</view>
 			</block>
 			<block v-else>
 				<app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
 			</block>
-		</div>
-		<div class="app-footer">
+		</view>
+		<view class="app-footer">
 			<button class="admin-button-com middle blue" @click="addCategoryFn">添加分类</button>
-		</div>
+		</view>
 		<modal-module :show="modifyModal" :maskClosable="false" @cancel="modalCancel" @click="replaceModalClick" :title="modifyTitle" padding="30rpx 30rpx">
 			<template v-slot:content>
-				<div class="app-modal-input-wrap modify-modal">
-					<div class="inp-list-line">
-						<div class="line-label">名称</div>
-						<div class="line-input">
-							<input type="text" v-model="replaceForm.name" :adjust-position="false" class="inp-input" placeholder="请填写" />
-						</div>
-					</div>
-					<div class="inp-list-line">
-						<div class="line-label">顺序</div>
-						<div class="line-input">
+				<view class="app-modal-input-wrap modify-modal">
+					<view class="inp-list-line">
+						<view class="line-label">名称</view>
+						<view class="line-input">
+							<input type="text" v-model="replaceForm.name" :adjust-position="false" @focus="replaceForm.name=''" class="inp-input" placeholder="请填写" />
+						</view>
+					</view>
+					<view class="inp-list-line">
+						<view class="line-label">顺序</view>
+						<view class="line-input">
 							<input type="number" v-model="replaceForm.inTurn" @focus="replaceForm.inTurn=''" :adjust-position="false" class="inp-input" placeholder="越大越靠前" />
-						</div>
-					</div>
-					<div class="inp-list-line">
-						<div class="line-label">打印显示</div>
-						<div class="line-input">
+						</view>
+					</view>
+					<view class="inp-list-line">
+						<view class="line-label">打印显示</view>
+						<view class="line-input">
 							<switch style="transform:scale(0.7,0.7)" :checked="replaceForm.print == 0 ? false : true" @change="printChange" /> {{replaceForm.print==0 ? '否' : '是'}}
-						</div>
-					</div>
-				</div>
+						</view>
+					</view>
+					<view class="inp-list-line cover-upload-line">
+						<view class="line-label">封面</view>
+						<view class="line-input cover-upload-wrap">
+							<htz-image-upload :max="1" :compress="true" v-model="coverImgData" :headers="headers"
+								@uploadSuccess="coverUploadSuccess" @imgDelete="coverImgDelete" :action="loginInfo.imgUploadApi">
+							</htz-image-upload>
+						</view>
+					</view>
+				</view>
 			</template>
 		</modal-module>
 		<modal-module :show="delModal" :maskClosable="false" @cancel="modalCancel" @click="delModalClick" content="确定删除?" color="#333" :size="32" padding="30upx 30upx"></modal-module>
-	</div>
+	</view>
 </template>
 <script>
 import ModalModule from '@/components/plugin/modal'
 import AppUploader from '@/components/app-uploader'
 import OperateModule from '@/admin/home/components/module/operate'
 import AppWrapperEmpty from '@/components/app-wrapper-empty'
+import htzImageUpload from '@/components/htz-image-upload/htz-image-upload.vue'
 import { list } from '@/mixins'
 import { getList,addClass,updateClass,delClass} from '@/api/item-class'
+import { mapGetters } from 'vuex'
 export default {
 	name: 'item-class-list',
 	components: {
 		ModalModule,
 		AppUploader,
 		OperateModule,
-		AppWrapperEmpty
+		AppWrapperEmpty,
+		htzImageUpload
 	},
 	mixins: [list],
 	data() {
@@ -81,8 +93,11 @@ export default {
 				name: '',
 				id:0,
 				inTurn: 100,
-				print:1
+				print:1,
+				cover: ''
 			},
+			coverImgData: [],
+			headers: {token:''},
 			delModal: false,
 			operateShow: false,
 			operateData: {},
@@ -91,6 +106,7 @@ export default {
 		}
 	},
 	computed: {
+		...mapGetters({ loginInfo: "getLoginInfo" }),
 		btnData() {
 			return [
 				{
@@ -103,7 +119,8 @@ export default {
 							name: this.operateData.name,
 							id: this.operateData.id,
 							inTurn: this.operateData.inTurn,
-							print:this.operateData.print
+							print:this.operateData.print,
+							cover: this.operateData.shortCover
 						}
 					}
 				},
@@ -133,8 +150,21 @@ export default {
 		}
 	},
 	onLoad() {
+		const token = uni.getStorageSync('token')
+		this.headers.token = token
 	},
 	methods: {
+		coverUploadSuccess(res) {
+			var _res = JSON.parse(res.data)
+			if(_res.code == 1){
+				this.replaceForm.cover = _res.data.shortUrl
+				this.coverImgData.push(_res.data.bigUrl)
+				this.$msg('上传成功')
+			}
+		},
+		coverImgDelete(res){
+			this.replaceForm.cover = ''
+		},
 		printChange(e){
 			this.replaceForm.print = e.target.value ? 1 : 0
 		},
@@ -150,28 +180,16 @@ export default {
 			})
 		},
 		editItem(item){
-				this.modifyModal = true
-				this.modifyTitle = '编辑'
-				this.replaceForm = {
-                    id:item.id,
-					name: item.name,
-					inTurn: item.inTurn,
-					print:item.print
-				}			
-		},
-		operateList(index){
-			if(index === 0){
-				this.modifyModal = true
-				this.modifyTitle = '编辑'
-				this.replaceForm = {
-                    id:this.operateData.id,
-					name: this.operateData.name,
-					inTurn: this.operateData.inTurn,
-					print:this.operateData.print
-				}
-			}else if(index === 1) {
-				this.delModal = true
+			this.modifyModal = true
+			this.modifyTitle = '编辑'
+			this.replaceForm = {
+				id:item.id,
+				name: item.name,
+				inTurn: item.inTurn,
+				print:item.print,
+				cover: item.shortCover
 			}
+			this.coverImgData = item.bigCover ? [item.bigCover] : []
 		},
 		async init() {
 			this.getClassList()
@@ -188,9 +206,7 @@ export default {
 			}
 			let host = this.replaceForm.id == 0 ?  addClass : updateClass;
 			let form = JSON.parse(JSON.stringify(this.replaceForm))
-			host({
-				...form
-			}).then(res => {
+			host({ ...form }).then(res => {
 				this.$msg('操作成功')
 				this.modalCancel()
 				this.operateCancle()
@@ -209,8 +225,10 @@ export default {
 			this.replaceForm = {
 				name: '',
 				inTurn: 0,
-                id:0
+				id:0,
+				cover: ''
 			}
+			this.coverImgData = []
 		},
 		replaceModalClick(e) {
 			if (e.index === 0) {
@@ -250,14 +268,7 @@ export default {
 		},
         globalClick(){
             this.operateCancle()
-        },
-		changeStatusFn() {
-            uni.showToast({
-                title: '开发中',
-                duration: 2000, 
-                icon:'none',
-            });
-		}
+        }
 	}
 }
 </script>
@@ -336,5 +347,13 @@ export default {
 		.switch-wrap {
 			margin-top: 30upx;
 		}
+		.cover-upload-line {
+			flex-direction: column;
+			align-items: flex-start;
+		}
+		.cover-upload-wrap {
+			width: 100%;
+			margin-top: 15upx;
+		}
 	}
 </style>

+ 38 - 48
ghsApp/src/admin/itemClass/more.vue

@@ -16,19 +16,18 @@
 						}"
 					>
 						<!-- 可拖拽的内容区域 -->
-						<view
-							class="item-drag-area"
-							:data-index="index"
-							:data-id="item.id"
-							@touchstart="dragStart"
-							@touchmove="dragMove"
-							@touchend="dragEnd"
-						>
-							<view class="item-content">
-								<view class="item-name">{{ item.name }}</view>
-								<view class="item-index">第{{ index + 1 }}位,按名字可以拖拽</view>
-							</view>
-						</view>
+					<view
+						class="item-content"
+						:data-index="index"
+						:data-id="item.id"
+						@touchstart="dragStart"
+						@touchmove="dragMove"
+						@touchend="dragEnd"
+						style="width: fit-content;"
+					>
+						<view class="item-name">{{ item.name }}</view>
+						<view class="item-index">第{{ index + 1 }}位,按名字可以拖拽</view>
+					</view>
 
 						<!-- 操作按钮区域 -->
 						<view class="buttons-area">
@@ -401,17 +400,11 @@ export default {
 				id: item.id,
 				inTurn: this.list.data.length - index // 反向索引,第一个有最大值
 			}));
-
 			batchChangeMore({ addData: JSON.stringify(sortData) }).then(res => {
 				if (res.code == 1) {
-					that.$msg('已保存');
-				} else {
-					that.$msg(res.msg || '保存失败');
+					//that.$msg('已保存')
 				}
-			}).catch(err => {
-				that.$msg('保存出错');
-				console.error(err);
-			});
+			})
 		},
 
 		async init() {
@@ -450,54 +443,51 @@ export default {
 	position: relative;
 	background-color: #fff;
 
-	.sort-item {
-		height: 100upx;
-		display: flex;
-		align-items: center;
-		padding: 12upx 0;
-		margin: 0 30upx;
-		color: #333;
-		border-bottom: 1px solid #f0f0f0;
-		position: relative;
-		transition: all 0.3s ease;
-
-		.item-drag-area {
-			flex: 1;
+		.sort-item {
+			height: 100upx;
 			display: flex;
 			align-items: center;
-			user-select: none;
-			-webkit-user-select: none;
-			touch-action: none;
-			-webkit-touch-callout: none;
+			padding: 12upx 0;
+			margin: 0 30upx;
+			color: #333;
+			border-bottom: 1px solid #f0f0f0;
+			position: relative;
+			transition: all 0.3s ease;
 
 			.item-content {
-				flex: 1;
 				display: flex;
 				flex-direction: column;
 				justify-content: center;
+				width: auto;
+				user-select: none;
+				-webkit-user-select: none;
+				touch-action: none;
+				-webkit-touch-callout: none;
 
 				.item-name {
 					font-size: 28upx;
 					font-weight: bold;
 					color: #000;
 					margin-bottom: 4upx;
+					white-space: nowrap;
 				}
 
 				.item-index {
 					font-size: 22upx;
 					color: #999;
+					white-space: nowrap;
 				}
 			}
-		}
 
-	.buttons-area {
-		display: flex;
-		gap: 24upx;
-		align-items: center;
-		padding-left: 20upx;
-		pointer-events: auto;
-	}
-	}
+		.buttons-area {
+			display: flex;
+			gap: 24upx;
+			align-items: center;
+			padding-left: 20upx;
+			pointer-events: auto;
+			margin-left: auto;
+		}
+		}
 }
 
 .move-btn {

+ 2 - 2
ghsApp/src/admin/shop/sk.vue

@@ -24,7 +24,7 @@
             <radio-group class="tui-input" @change="thirdSendChange">
               <label class="list" for="thirdSendOk">
                 <radio id="thirdSendOk" value="0" :checked="thirdSend == 0" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">允许选跑腿</span>
+                <span class="checkbox-text">可以选跑腿</span>
               </label>
               <label class="list" for="thirdSendNo">
                 <radio id="thirdSendNo" value="1" :checked="thirdSend == 1" style="transform:scale(0.7,0.7)" />
@@ -42,7 +42,7 @@
               </label>
               <label class="list" for="thirdSendFeeZd" style="display: flex; align-items: center; white-space: nowrap;">
                 <radio id="thirdSendFeeZd" value="1" :checked="thirdSendFee == 1" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">下单时算好,提前收取</span>
+                <span class="checkbox-text">下单时提前算好并收取</span>
               </label>
             </radio-group>
           </tui-list-cell>

+ 2 - 2
ghsApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "销花宝",
     "appid" : "__UNI__BD781B0",
     "description" : "鲜花批发销售管理系统",
-    "versionName" : "1.2.63",
-    "versionCode" : 1263,
+    "versionName" : "1.2.64",
+    "versionCode" : 1264,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

+ 4 - 4
hdApp/src/admin/home/components/order-item.vue

@@ -2,8 +2,8 @@
 	<view class="list-module">
 		<block v-if="!$util.isEmpty(info)">
 			<view class="list-left">
-				<view class="image">
-					<image :src="info.cover" mode="aspectFit"></image>
+				<view class="item-image">
+					<image :src="info.cover" class="cover" mode="aspectFill"></image>
 				</view>
 				<image class="scan-icon" v-if="info.repeat == 1 && info.payStatus == 1" :src="`${constant.imgUrl}/gathering/scan.jpg`" mode="aspectFit"></image>
 				<view class="list-msg">
@@ -61,9 +61,9 @@ export default {
 	.list-left {
 		position: relative;
 		@include disFlex(flex-start, space-between);
-		.image {
+		.item-image {
 			position: relative;
-			image{
+			.cover{
 				width:120upx;
 				height:120upx;
 				position: absolute;

+ 123 - 82
hdApp/src/admin/itemClass/list.vue

@@ -1,71 +1,88 @@
 <template>
-	<div class="app-content" @click="globalClick">
-		<div class="list-wrap">
+	<view class="app-content" @click="globalClick">
+		<view class="list-wrap">
 			<block v-if="!$util.isEmpty(list.data)">
-				<div class="list" v-for="(item, index) in list.data" :key="index">
-					<div class="list-index">{{ item.id }}</div>
-					<div class="list-det">
-						<div class="app-size-28 app-color-0">{{ item.name || '' }}</div>
-						<div class="list-operate">
-							<div class="operate-det">
-								<span>序号:{{ item.inTurn }}</span>
-							</div>
-							<text class="add-price" @click.stop="pageTo('/admin/itemClass/addPrice?classId='+item.id)">加价</text>
-							<text class="add-price" @click.stop="pageTo('/admin/itemClass/more?classId='+item.id)">排序</text>
-							<div class="operate-icon" @click="editItem(item)">
-								<i class="iconfont" :class="[ index == operateIndex ? 'iconbianji' : 'iconbianji']" style="font-size:38upx;"></i>
-							</div>
-						</div>
-					</div>
-				</div>
-				<operate-module v-if="operateShow" :top="operateTop" :right="30" @clickFn="operateList" :btnData="btnData" />
+				<view class="list" v-for="(item, index) in list.data" :key="index">
+					<view class="list-index">
+						<image  :src="item.smallCover" style="width:80upx;height:80upx;" mode="widthFix"></image>
+					</view>
+					<view class="list-det" @click="editItem(item)">
+						<view class="app-size-28 app-color-0" style="font-size:28upx;font-weight:bold;color:#333333;">
+						{{ item.name || '' }}
+						</view>
+						<view class="list-operate">
+							<view class="operate-det" style="color:#333333;">
+								<span>序号 {{ item.inTurn }}</span>
+							</view>
+							<view class="operate-icon">
+								<i class="iconfont iconbianji" style="font-size:38upx;"></i>
+							</view>
+							<view class="operate-icon" @click.stop="delClass(item)">
+								<i class="iconfont iconshanchu1" style="font-size:38upx;"></i>
+							</view>
+						</view>
+					</view>
+				</view>
 			</block>
 			<block v-else>
 				<app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
 			</block>
-		</div>
-		<div class="app-footer">
+		</view>
+		<view class="app-footer">
 			<button class="admin-button-com middle blue" @click="addCategoryFn">添加分类</button>
-		</div>
+		</view>
 		<modal-module :show="modifyModal" :maskClosable="false" @cancel="modalCancel" @click="replaceModalClick" :title="modifyTitle" padding="30rpx 30rpx">
 			<template v-slot:content>
-				<div class="app-modal-input-wrap modify-modal">
-					<div class="inp-list-line">
-						<div class="line-label">名称</div>
-						<div class="line-input">
-							<input type="text" v-model="replaceForm.name" :adjust-position="false" class="inp-input" placeholder="请填写" />
-						</div>
-					</div>
-					<div class="inp-list-line">
-						<div class="line-label">顺序</div>
-						<div class="line-input">
+				<view class="app-modal-input-wrap modify-modal">
+					<view class="inp-list-line">
+						<view class="line-label">名称</view>
+						<view class="line-input">
+							<input type="text" v-model="replaceForm.name" :adjust-position="false" @focus="replaceForm.name=''" class="inp-input" placeholder="请填写" />
+						</view>
+					</view>
+					<view class="inp-list-line">
+						<view class="line-label">顺序</view>
+						<view class="line-input">
 							<input type="number" v-model="replaceForm.inTurn" @focus="replaceForm.inTurn=''" :adjust-position="false" class="inp-input" placeholder="越大越靠前" />
-						</div>
-					</div>
-				</div>
+						</view>
+					</view>
+					<view class="inp-list-line">
+						<view class="line-label">打印显示</view>
+						<view class="line-input">
+							<switch style="transform:scale(0.7,0.7)" :checked="replaceForm.print == 0 ? false : true" @change="printChange" /> {{replaceForm.print==0 ? '否' : '是'}}
+						</view>
+					</view>
+					<view class="inp-list-line cover-upload-line">
+						<view class="line-label">封面</view>
+						<view class="line-input cover-upload-wrap">
+							<htz-image-upload :max="1" :compress="true" v-model="coverImgData" :headers="headers"
+								@uploadSuccess="coverUploadSuccess" @imgDelete="coverImgDelete" :action="loginInfo.imgUploadApi">
+							</htz-image-upload>
+						</view>
+					</view>
+				</view>
 			</template>
 		</modal-module>
-		<modal-module :show="delModal" :maskClosable="false" @cancel="modalCancel" @click="delModalClick" content="确定删除?" color="#333" :size="32" padding="30rpx 30rpx"></modal-module>
-	</div>
+		<modal-module :show="delModal" :maskClosable="false" @cancel="modalCancel" @click="delModalClick" content="确定删除?" color="#333" :size="32" padding="30upx 30upx"></modal-module>
+	</view>
 </template>
 <script>
 import ModalModule from '@/components/plugin/modal'
 import AppUploader from '@/components/app-uploader'
 import OperateModule from '@/admin/home/components/module/operate'
 import AppWrapperEmpty from '@/components/app-wrapper-empty'
+import htzImageUpload from '@/components/htz-image-upload/htz-image-upload.vue'
 import { list } from '@/mixins'
-import { getList,addClass,updateClass} from '@/api/item-class'
-import { allProduct } from "@/api/product/index";
-// #ifdef APP-PLUS
-const plug= uni.requireNativePlugin('Html5app-Gprinter')
-// #endif
+import { getList,addClass,updateClass,delClass} from '@/api/item-class'
+import { mapGetters } from 'vuex'
 export default {
 	name: 'item-class-list',
 	components: {
 		ModalModule,
 		AppUploader,
 		OperateModule,
-		AppWrapperEmpty
+		AppWrapperEmpty,
+		htzImageUpload
 	},
 	mixins: [list],
 	data() {
@@ -75,8 +92,12 @@ export default {
 			replaceForm: {
 				name: '',
 				id:0,
-				inTurn: 100
+				inTurn: 100,
+				print:1,
+				cover: ''
 			},
+			coverImgData: [],
+			headers: {token:''},
 			delModal: false,
 			operateShow: false,
 			operateData: {},
@@ -96,7 +117,9 @@ export default {
 						this.modifyForm = {
 							name: this.operateData.name,
 							id: this.operateData.id,
-							inTurn: this.operateData.inTurn
+							inTurn: this.operateData.inTurn,
+							print:this.operateData.print,
+							cover: this.operateData.shortCover
 						}
 					}
 				},
@@ -112,13 +135,13 @@ export default {
 	},
 	onPullDownRefresh() {
 		this.resetList()
-		this._list().then(res => {
+		this.getClassList().then(res => {
 			uni.stopPullDownRefresh()
 		})
 	},
 	onReachBottom() {
 		if (!this.list.finished) {
-			this._list().then(res => {
+			this.getClassList().then(res => {
 				uni.stopPullDownRefresh()
 			})
 		} else {
@@ -126,34 +149,51 @@ export default {
 		}
 	},
 	onLoad() {
+		const token = uni.getStorageSync('token')
+		this.headers.token = token
 	},
 	methods: {
-		editItem(item){
-				this.modifyModal = true
-				this.modifyTitle = '编辑'
-				this.replaceForm = {
-                    id:item.id,
-					name: item.name,
-					inTurn: item.inTurn,
-				}			
+		coverUploadSuccess(res) {
+			var _res = JSON.parse(res.data)
+			if(_res.code == 1){
+				this.replaceForm.cover = _res.data.shortUrl
+				this.coverImgData.push(_res.data.bigUrl)
+				this.$msg('上传成功')
+			}
 		},
-		operateList(index){
-			if(index === 0){
-				this.modifyModal = true
-				this.modifyTitle = '编辑'
-				this.replaceForm = {
-                    id:this.operateData.id,
-					name: this.operateData.name,
-					inTurn: this.operateData.inTurn,
-				}
-			}else if(index === 1) {
-				this.delModal = true
+		coverImgDelete(res){
+			this.replaceForm.cover = ''
+		},
+		printChange(e){
+			this.replaceForm.print = e.target.value ? 1 : 0
+		},
+		delClass(item){
+			let that = this
+			that.$util.confirmModal({content:'确认删除?此分类的花材将移到默认分类'},() => {
+				delClass({id:item.id}).then(res=>{
+					if(res.code == 1){
+						that.$msg('删除成功')
+						that.getClassList()
+					}
+				})
+			})
+		},
+		editItem(item){
+			this.modifyModal = true
+			this.modifyTitle = '编辑'
+			this.replaceForm = {
+				id:item.id,
+				name: item.name,
+				inTurn: item.inTurn,
+				print:item.print,
+				cover: item.shortCover
 			}
+			this.coverImgData = item.bigCover ? [item.bigCover] : []
 		},
 		async init() {
-			this._list()
+			this.getClassList()
 		},
-		_list() {
+		getClassList() {
 			return getList({page: this.list.page}).then(res => {
 				this.completes(res)
 			})
@@ -165,15 +205,13 @@ export default {
 			}
 			let host = this.replaceForm.id == 0 ?  addClass : updateClass;
 			let form = JSON.parse(JSON.stringify(this.replaceForm))
-			host({
-				...form
-			}).then(res => {
+			host({ ...form }).then(res => {
 				this.$msg('操作成功')
 				this.modalCancel()
 				this.operateCancle()
 				setTimeout(() => {
 					this.resetList()
-					this._list()
+					this.getClassList()
 				}, 1000)
 			})
 		},
@@ -186,8 +224,10 @@ export default {
 			this.replaceForm = {
 				name: '',
 				inTurn: 0,
-                id:0
+				id:0,
+				cover: ''
 			}
+			this.coverImgData = []
 		},
 		replaceModalClick(e) {
 			if (e.index === 0) {
@@ -227,14 +267,7 @@ export default {
 		},
         globalClick(){
             this.operateCancle()
-        },
-		changeStatusFn() {
-            uni.showToast({
-                title: '开发中',
-                duration: 2000, 
-                icon:'none',
-            });
-		}
+        }
 	}
 }
 </script>
@@ -286,7 +319,7 @@ export default {
 						margin-left:10upx;
 					}
 					.operate-icon{
-						margin-left:30upx;
+						margin-left:5upx;
 					}
 				}
 			}
@@ -313,5 +346,13 @@ export default {
 		.switch-wrap {
 			margin-top: 30upx;
 		}
+		.cover-upload-line {
+			flex-direction: column;
+			align-items: flex-start;
+		}
+		.cover-upload-wrap {
+			width: 100%;
+			margin-top: 15upx;
+		}
 	}
 </style>

+ 3 - 3
hdApp/src/admin/shop/sk.vue

@@ -36,7 +36,7 @@
             <radio-group class="tui-input" @change="thirdSendChange">
               <label class="list" for="thirdSendOk">
                 <radio id="thirdSendOk" value="0" :checked="thirdSend == 0" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">允许选跑腿</span>
+                <span class="checkbox-text">可以选跑腿</span>
               </label>
               <label class="list" for="thirdSendNo">
                 <radio id="thirdSendNo" value="1" :checked="thirdSend == 1" style="transform:scale(0.7,0.7)" />
@@ -50,11 +50,11 @@
             <radio-group class="tui-input" @change="thirdSendFeeChange" style="display: flex; flex-wrap: wrap; gap: 30upx;">
               <label class="list" for="thirdSendFeeDf" style="display: flex; align-items: center; white-space: nowrap;">
                 <radio id="thirdSendFeeDf" value="0" :checked="thirdSendFee == 0" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">客户自理或后补收</span>
+                <span class="checkbox-text">客户自理或发货后补收</span>
               </label>
               <label class="list" for="thirdSendFeeZd" style="display: flex; align-items: center; white-space: nowrap;">
                 <radio id="thirdSendFeeZd" value="1" :checked="thirdSendFee == 1" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">下单时算好,提前收取</span>
+                <span class="checkbox-text">下单时提前算好并收取</span>
               </label>
             </radio-group>
           </tui-list-cell>

+ 2 - 2
hdApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜",
     "appid" : "__UNI__4079DC1",
     "description" : "花店管家婆",
-    "versionName" : "2.1.4",
-    "versionCode" : 214,
+    "versionName" : "2.1.5",
+    "versionCode" : 215,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

+ 37 - 0
hdApp/src/pagesPurchase/wechatPay.vue

@@ -50,6 +50,7 @@
           </view>
           <button class="button-com pay-wx" :class="[remainPayTime >0 ? 'ali-btn':'default']" :disabled="remainPayTime >0 ? false : true" @click="appAliPayFn(1)">支付宝支付</button>
           <button class="button-com pay-wx" :class="[remainPayTime >0 ? 'green':'default']" :disabled="remainPayTime >0 ? false : true" @click="debtPay" v-if="hasDebtPay === '1'">赊账</button>
+          <view style="color:#CCCCCC;font-size:26upx;text-align: center;margin-top:50upx;" @click="beginOpenMini()">小程序</view>
         </div>
         <!-- #endif -->
         </block>
@@ -163,6 +164,42 @@ export default {
         }
       })
     },
+    beginOpenMini(){
+      this.$util.confirmModal({content:'确认打开小程序'},() => {
+        this.openBuyMini()
+      })
+    },
+    openBuyMini(){
+        // #ifdef APP-PLUS
+        let that = this
+        if(plus.runtime.isApplicationExist({pname:'com.tencent.mm',action:'weixin://'})){
+          plus.share.getServices(function(s){
+            var sweixin
+            for (var i = 0; i < s.length; i++) {
+              var t = s[i];
+              if (t.id == 'weixin') {
+                  sweixin = t;
+              }
+            }
+            let miniOriginalId = that.dictInfo.miniOriginalId && that.dictInfo.miniOriginalId.current && that.dictInfo.miniOriginalId.current.hd ? that.dictInfo.miniOriginalId.current.hd : ''
+            if (sweixin && sweixin.nativeClient) {
+              sweixin.launchMiniProgram({
+                id: miniOriginalId,
+                path: '/pagesPurchase/order',
+                type: 0
+              });
+            } else {
+              that.$msg("没有找到微信服务")
+            }
+          }, function(e){
+              that.$msg("没有找到微信服务哦")
+          });
+        } else {
+          that.$msg("请安装微信,再打开小程序")
+          return false
+        }
+        // #endif
+    },
     useAliPay(){
       let id = this.option.id ? this.option.id : 0
       let realPrice = this.option.realPrice ? this.option.realPrice : 0

+ 2 - 2
开发http/ghsApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "销花宝",
     "appid" : "__UNI__BD781B0",
     "description" : "鲜花批发销售管理系统",
-    "versionName" : "1.2.63",
-    "versionCode" : 1263,
+    "versionName" : "1.2.64",
+    "versionCode" : 1264,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

+ 2 - 2
开发http/hdApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜",
     "appid" : "__UNI__4079DC1",
     "description" : "花店管家婆",
-    "versionName" : "2.1.4",
-    "versionCode" : 214,
+    "versionName" : "2.1.5",
+    "versionCode" : 215,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

+ 2 - 2
开发https/ghsApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "销花宝",
     "appid" : "__UNI__BD781B0",
     "description" : "鲜花批发销售管理系统",
-    "versionName" : "1.2.63",
-    "versionCode" : 1263,
+    "versionName" : "1.2.64",
+    "versionCode" : 1264,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

+ 2 - 2
开发https/hdApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜",
     "appid" : "__UNI__4079DC1",
     "description" : "花店管家婆",
-    "versionName" : "2.1.4",
-    "versionCode" : 214,
+    "versionName" : "2.1.5",
+    "versionCode" : 215,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

+ 2 - 2
线上/ghsApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "销花宝",
     "appid" : "__UNI__BD781B0",
     "description" : "鲜花批发销售管理系统",
-    "versionName" : "1.2.63",
-    "versionCode" : 1263,
+    "versionName" : "1.2.64",
+    "versionCode" : 1264,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

+ 2 - 2
线上/hdApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜",
     "appid" : "__UNI__4079DC1",
     "description" : "花店管家婆",
-    "versionName" : "2.1.4",
-    "versionCode" : 214,
+    "versionName" : "2.1.5",
+    "versionCode" : 215,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {