Ver código fonte

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

shizhongqi 4 meses atrás
pai
commit
3557799730

+ 141 - 2
ghsApp/src/admin/item/presell.vue

@@ -34,6 +34,68 @@
 				<view class="tui-input" @click="showDatePicker(4)" style="width:350upx;" v-else>{{ form.date4 }}</view>
 				<button class="admin-button-com mini-btn blue" @click="form.date4=''">清空</button>
 			</tui-list-cell>
+
+			<tui-list-cell class="line-cell" :hover="false">
+				<div class="tui-title">到货日期5</div>
+				<view class="tui-input" v-if="form.date5==''" @click="showDatePicker(5)" style="color:#CCCCCC;width:350upx;">请填写日期</view>
+				<view class="tui-input" @click="showDatePicker(5)" style="width:350upx;" v-else>{{ form.date5 }}</view>
+				<button class="admin-button-com mini-btn blue" @click="form.date5=''">清空</button>
+			</tui-list-cell>
+			<tui-list-cell class="line-cell" :hover="false">
+				<div class="tui-title">到货日期6</div>
+				<view class="tui-input" v-if="form.date6==''" @click="showDatePicker(6)" style="color:#CCCCCC;width:350upx;">请填写日期</view>
+				<view class="tui-input" @click="showDatePicker(6)" style="width:350upx;" v-else>{{ form.date6 }}</view>
+				<button class="admin-button-com mini-btn blue" @click="form.date6=''">清空</button>
+			</tui-list-cell>
+			<tui-list-cell class="line-cell" :hover="false">
+				<div class="tui-title">到货日期7</div>
+				<view class="tui-input" v-if="form.date7==''" @click="showDatePicker(7)" style="color:#CCCCCC;width:350upx;">请填写日期</view>
+				<view class="tui-input" @click="showDatePicker(7)" style="width:350upx;" v-else>{{ form.date7 }}</view>
+				<button class="admin-button-com mini-btn blue" @click="form.date7=''">清空</button>
+			</tui-list-cell>
+			<tui-list-cell class="line-cell" :hover="false">
+				<div class="tui-title">到货日期8</div>
+				<view class="tui-input" v-if="form.date8==''" @click="showDatePicker(8)" style="color:#CCCCCC;width:350upx;">请填写日期</view>
+				<view class="tui-input" @click="showDatePicker(8)" style="width:350upx;" v-else>{{ form.date8 }}</view>
+				<button class="admin-button-com mini-btn blue" @click="form.date8=''">清空</button>
+			</tui-list-cell>
+			<tui-list-cell class="line-cell" :hover="false">
+				<div class="tui-title">到货日期9</div>
+				<view class="tui-input" v-if="form.date9==''" @click="showDatePicker(9)" style="color:#CCCCCC;width:350upx;">请填写日期</view>
+				<view class="tui-input" @click="showDatePicker(9)" style="width:350upx;" v-else>{{ form.date9 }}</view>
+				<button class="admin-button-com mini-btn blue" @click="form.date9=''">清空</button>
+			</tui-list-cell>
+			<tui-list-cell class="line-cell" :hover="false">
+				<div class="tui-title">到货日期10</div>
+				<view class="tui-input" v-if="form.date10==''" @click="showDatePicker(10)" style="color:#CCCCCC;width:350upx;">请填写日期</view>
+				<view class="tui-input" @click="showDatePicker(10)" style="width:350upx;" v-else>{{ form.date10 }}</view>
+				<button class="admin-button-com mini-btn blue" @click="form.date10=''">清空</button>
+			</tui-list-cell>
+			<tui-list-cell class="line-cell" :hover="false">
+				<div class="tui-title">到货日期11</div>
+				<view class="tui-input" v-if="form.date11==''" @click="showDatePicker(11)" style="color:#CCCCCC;width:350upx;">请填写日期</view>
+				<view class="tui-input" @click="showDatePicker(11)" style="width:350upx;" v-else>{{ form.date11 }}</view>
+				<button class="admin-button-com mini-btn blue" @click="form.date11=''">清空</button>
+			</tui-list-cell>
+			<tui-list-cell class="line-cell" :hover="false">
+				<div class="tui-title">到货日期12</div>
+				<view class="tui-input" v-if="form.date12==''" @click="showDatePicker(12)" style="color:#CCCCCC;width:350upx;">请填写日期</view>
+				<view class="tui-input" @click="showDatePicker(12)" style="width:350upx;" v-else>{{ form.date12 }}</view>
+				<button class="admin-button-com mini-btn blue" @click="form.date12=''">清空</button>
+			</tui-list-cell>
+			<tui-list-cell class="line-cell" :hover="false">
+				<div class="tui-title">到货日期13</div>
+				<view class="tui-input" v-if="form.date13==''" @click="showDatePicker(13)" style="color:#CCCCCC;width:350upx;">请填写日期</view>
+				<view class="tui-input" @click="showDatePicker(13)" style="width:350upx;" v-else>{{ form.date13 }}</view>
+				<button class="admin-button-com mini-btn blue" @click="form.date13=''">清空</button>
+			</tui-list-cell>
+			<tui-list-cell class="line-cell" :hover="false">
+				<div class="tui-title">到货日期14</div>
+				<view class="tui-input" v-if="form.date14==''" @click="showDatePicker(14)" style="color:#CCCCCC;width:350upx;">请填写日期</view>
+				<view class="tui-input" @click="showDatePicker(14)" style="width:350upx;" v-else>{{ form.date14 }}</view>
+				<button class="admin-button-com mini-btn blue" @click="form.date14=''">清空</button>
+			</tui-list-cell>
+
 			</block>
         </div>
 		<view style="width:100%;text-align:center;font-size:36upx;" v-if="form.presell == 1">
@@ -62,7 +124,8 @@ export default {
     return {
 		showPicker:false,
 		form:{
-			date1:'',date2:'',date3:'',date4:'',presell:0
+			date1:'',date2:'',date3:'',date4:'',date5:'',date6:'',date7:'',date8:'',date9:'',date10:'',
+			date11:'',date12:'',date13:'',date14:'',presell:0
 		},
 		index:1
     }
@@ -82,6 +145,26 @@ export default {
 						that.form.date3 = item
 					}else if(idx == 3){
 						that.form.date4 = item
+					}else if(idx == 4){
+						that.form.date5 = item
+					}else if(idx == 5){
+						that.form.date6 = item
+					}else if(idx == 6){
+						that.form.date7 = item
+					}else if(idx == 7){
+						that.form.date8 = item
+					}else if(idx == 8){
+						that.form.date9 = item
+					}else if(idx == 9){
+						that.form.date10 = item
+					}else if(idx == 10){
+						that.form.date11 = item
+					}else if(idx == 11){
+						that.form.date12 = item
+					}else if(idx == 12){
+						that.form.date13 = item
+					}else if(idx == 13){
+						that.form.date14 = item
 					}else{
 
 					}
@@ -110,6 +193,26 @@ export default {
 			this.form.date3 = e.value
 		}else if(this.index == 4){
 			this.form.date4 = e.value
+		}else if(this.index == 5){
+			this.form.date5 = e.value
+		}else if(this.index == 6){
+			this.form.date6 = e.value
+		}else if(this.index == 7){
+			this.form.date7 = e.value
+		}else if(this.index == 8){
+			this.form.date8 = e.value
+		}else if(this.index == 9){
+			this.form.date9 = e.value
+		}else if(this.index == 10){
+			this.form.date10 = e.value
+		}else if(this.index == 11){
+			this.form.date11 = e.value
+		}else if(this.index == 12){
+			this.form.date12 = e.value
+		}else if(this.index == 13){
+			this.form.date13 = e.value
+		}else if(this.index == 14){
+			this.form.date14 = e.value
 		}else{
 			this.$msg('暂无选项')
 		}
@@ -129,6 +232,36 @@ export default {
 		if(!this.$util.isEmpty(this.form.date4)){
 			arr.push(this.form.date4)
 		}
+		if(!this.$util.isEmpty(this.form.date5)){
+			arr.push(this.form.date5)
+		}
+		if(!this.$util.isEmpty(this.form.date6)){
+			arr.push(this.form.date6)
+		}
+		if(!this.$util.isEmpty(this.form.date7)){
+			arr.push(this.form.date7)
+		}
+		if(!this.$util.isEmpty(this.form.date8)){
+			arr.push(this.form.date8)
+		}
+		if(!this.$util.isEmpty(this.form.date9)){
+			arr.push(this.form.date9)
+		}
+		if(!this.$util.isEmpty(this.form.date10)){
+			arr.push(this.form.date10)
+		}
+		if(!this.$util.isEmpty(this.form.date11)){
+			arr.push(this.form.date11)
+		}
+		if(!this.$util.isEmpty(this.form.date12)){
+			arr.push(this.form.date12)
+		}
+		if(!this.$util.isEmpty(this.form.date13)){
+			arr.push(this.form.date13)
+		}
+		if(!this.$util.isEmpty(this.form.date14)){
+			arr.push(this.form.date14)
+		}
 		if(this.form.presell == 1 && this.$util.isEmpty(arr)){
 			this.$msg('请填写日期')
 			return false
@@ -152,6 +285,7 @@ export default {
 .app-content {
   min-height: calc(100vh - 20upx);
   padding-top: 20upx;
+  padding-bottom: 180upx;
 }
 .prompt-text {
   color: $fontColor3;
@@ -175,7 +309,12 @@ export default {
 }
 .confirm-btn {
   width: calc(100% - 60upx);
-  margin: 60upx 30upx 20upx;
+  position: fixed;
+  left: 30upx;
+  right: 30upx;
+  bottom: 20upx;
+  margin: 0;
+  z-index: 10;
   .admin-button-com {
     width: 100%;
   }

+ 2 - 1
hdApp/src/admin/home/apply.vue

@@ -49,7 +49,8 @@ export default {
                 { name: "买花记录", emoji: "📊", url: "/pagesPurchase/shopping",pf:1},
                 { name: "报损", emoji: "🗑️", url: "/admin/breakage/list",pf:1},
                 { name: "拆散", emoji: "✂️", url: "/admin/part/list",pf:1},
-                { name: "盘点", emoji: "📦", url: "/pagesStorehouse/inventory/list",pf:1}
+                { name: "盘点", emoji: "📦", url: "/pagesStorehouse/inventory/list",pf:1},
+                { name: "排序", emoji: "↕️", url: "/admin/itemClass/sort",pf:1},
             ]
         },
         {

+ 2 - 2
hdApp/src/admin/home/workbench.vue

@@ -99,7 +99,7 @@
                       <view class="tag_2 tag_2--highlight" @click.stop="callUp(ghsInfo)"> <text>联系本店</text> </view>
                       <view class="tag_2 tag_2--share tag_2--highlight">
                         <button open-type="share" :data-ghs="ghsInfo" class="share-button-mask"></button>
-                        <text>分享店</text>
+                        <text>分享店</text>
                       </view>
 
                       <!-- 买花记录提示 -->
@@ -1041,7 +1041,7 @@
     margin-top: 50upx;
     margin-bottom: 50upx;
     color: #827171;
-    font-size: 32upx;
+    font-size: 34upx;
   }
 
   .support-divider {

+ 58 - 10
hdApp/src/admin/item/detail.vue

@@ -120,6 +120,47 @@
           </view>
         </tui-list-cell>
 
+        <tui-list-cell class="line-cell" :hover="false">
+          <view class="tui-title">包装类型</view>
+          <view>
+            <button class="admin-button-com middle" :class="form.ratioType == 0 ? 'blue' : 'default'" @click="ratioTypeChange(0)">固定支数</button>
+            <button class="admin-button-com middle" :class="form.ratioType == 1 ? 'blue' : 'default'" @click="ratioTypeChange(1)" style="margin-left:20upx;">没有固定</button>
+            <button class="admin-button-com middle default" v-if="option.ptItemId" @click="oneZhiChange()" style="margin-left:20upx;">1支装</button>
+          </view>
+        </tui-list-cell>
+
+<block v-if="option.ptItemId">
+        <tui-list-cell class="line-cell" :arrow="true">
+          <view class="tui-title">大单位</view>
+          <picker mode="selector" :value="form.bigUnitId" :range="unitData" range-key="name" @change="changeBigUnitFn" class="tui-input" >
+            <input v-model="form.bigUnitId" name="bigUnitId" type="text" hidden />
+            <view v-if="form.bigUnitId" style="width:300upx;height:45upx;">{{ bigUnitSelectedData.name }}</view>
+            <view class="tui-placeholder" style="height:45upx;" v-else>请选择</view>
+          </picker>
+        </tui-list-cell>
+
+        <tui-list-cell class="line-cell" :arrow="true">
+          <view class="tui-title">小单位</view>
+          <picker mode="selector" :value="form.smallUnitId" :range="unitData" range-key="name" @change="changeSmallUnitFn" class="tui-input" >
+            <input v-model="form.smallUnitId" name="smallUnitId" type="text" hidden />
+            <view v-if="form.smallUnitId" style="width:300upx;height:45upx;">{{ smallUnitSelectedData.name }}</view>
+            <view class="tui-placeholder" style="height:45upx;" v-else>请选择</view>
+          </picker>
+        </tui-list-cell>
+
+        <tui-list-cell class="line-cell" :arrow="false" v-if="form.ratioType == 0" :hover="false">
+          <view class="tui-title">几支装</view>
+          <input v-model="form.ratio" placeholder-class="phcolor" style="width:300upx;"
+          class="tui-input" name="ratio" placeholder="20支装填20" maxlength="50" type="number" />
+        </tui-list-cell>
+
+        <tui-list-cell class="line-cell" :arrow="false" :hover="false">
+          <view class="tui-title">每扎重量</view>
+          <input v-model="form.weight" placeholder-class="phcolor" style="width:200upx;"
+          class="tui-input" name="weight" placeholder="公斤" maxlength="50" type="digit" />
+        </tui-list-cell>
+</block>
+<block v-else>
         <tui-list-cell class="line-cell" :arrow="false" :hover="false">
           <view class="tui-title">大单位</view>
           <input v-model="form.bigUnitId" name="bigUnitId" type="text" hidden />
@@ -136,14 +177,6 @@
           <button v-else class="admin-button-com default middle" style="width:150upx;" @click.stop="notAllowChange()">修改</button>
         </tui-list-cell>
 
-        <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">包装类型</view>
-          <view>
-            <button class="admin-button-com middle" :class="form.ratioType == 0 ? 'blue' : 'default'" @click="ratioTypeChange(0)">固定支数</button>
-            <button class="admin-button-com middle" :class="form.ratioType == 1 ? 'blue' : 'default'" @click="ratioTypeChange(1)" style="margin-left:140upx;">没有固定</button>
-          </view>
-        </tui-list-cell>
-
         <tui-list-cell class="line-cell" :arrow="false" v-if="form.ratioType == 0" :hover="false">
           <view class="tui-title">几支装</view>
           <input v-model="form.ratio" disabled="true" placeholder-class="phcolor" @click="$msg('不可修改')" style="width:300upx;color:#CCCCCC;"
@@ -162,6 +195,7 @@
           <button v-if="productData.id > 0 && productData.hasRightChange == 1" class="admin-button-com blue middle" @click.stop="changeWeight()" style="width:150upx;">修改</button>
           <button v-else class="admin-button-com default middle" style="width:150upx;" @click.stop="notAllowChange()">修改</button>
         </tui-list-cell>
+</block>
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">每人限购</view>
@@ -169,7 +203,6 @@
 
           <button v-if="productData.id > 0 && form.limitBuy>0" class="admin-button-com blue middle" @click.stop="clearBuyCache()" style="width:150upx;">清已购</button>
           <button v-else class="admin-button-com default middle" style="width:150upx;" @click.stop="">清已购</button>
-
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
@@ -601,6 +634,21 @@ export default {
 
   },
   methods: {
+    oneZhiChange(){
+      if (!Array.isArray(this.unitData) || this.unitData.length < 2) {
+        this.$msg('无法设置1支装')
+        return
+      }
+      const defaultUnit = this.unitData[1]
+      this.bigUnitSelectedData = defaultUnit
+      this.smallUnitSelectedData = defaultUnit
+      this.form.bigUnitId = defaultUnit.id
+      this.form.smallUnitId = defaultUnit.id
+      this.form.ratio = 1
+      this.form.ratioType = 0
+      this.form.weight = 0.1
+      this.$forceUpdate()
+    },
     selectMyItem(){
       this.$util.pageTo({ url: '/admin/item/selectItem?style=3'})
     },
@@ -1317,7 +1365,7 @@ export default {
 
       let form = JSON.parse(JSON.stringify(this.form))
       form.images = form.images.join(',')
-      uni.showLoading({mask:true,title:'提交中'})
+      uni.showLoading()
       requestHost({...form,appVersion:1}).then(res => {
         uni.hideLoading()
         if(res.code == 1){

+ 3 - 2
hdApp/src/admin/itemClass/list.vue

@@ -17,7 +17,7 @@
 							<view class="operate-icon">
 								<i class="iconfont iconbianji" style="font-size:38upx;"></i>
 							</view>
-							<view class="operate-icon" @click.stop="delClass(item)">
+							<view class="operate-icon" @click.stop="delThisClass(item)">
 								<i class="iconfont iconshanchu1" style="font-size:38upx;"></i>
 							</view>
 						</view>
@@ -167,12 +167,13 @@ export default {
 		printChange(e){
 			this.replaceForm.print = e.target.value ? 1 : 0
 		},
-		delClass(item){
+		delThisClass(item){
 			let that = this
 			that.$util.confirmModal({content:'确认删除?此分类的花材将移到默认分类'},() => {
 				delClass({id:item.id}).then(res=>{
 					if(res.code == 1){
 						that.$msg('删除成功')
+						that.resetList()
 						that.getClassList()
 					}
 				})

+ 140 - 0
hdApp/src/admin/itemClass/num.vue

@@ -0,0 +1,140 @@
+<template>
+	<view class="app-content">
+		<view v-if="!$util.isEmpty(list.data)" style="padding-bottom:120upx;">
+			<t-table :headerBackgroundColor="'#F0F2F6'">
+				<t-tr header>
+                    <t-th><view style="color:black;">名称</view></t-th>
+					<t-th><view style="color:black;">排序</view></t-th>
+				</t-tr>
+				<view v-for="(item, index) in list.data" :key="index">
+					<t-tr>
+                        <t-td align="center" color="info">
+						<view style="color:black;font-weight:bold;">{{item.name}}</view>
+						</t-td>
+						<t-td align="center" color="info">
+                            <view>
+							<input v-model="item.inTurn" name="inTurn" @focus="clear(item)"
+							type="number" style="border:1upx solid #cccccc;color:#333333;" />
+							</view>
+                        </t-td>
+					</t-tr>
+				</view>
+			</t-table>
+		</view>
+		<view v-else>
+			<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
+		</view>
+        <view class="app-footer">
+			<view class="admin-button-com big blue" @click="goBack()">返回上级</view>
+		    <view style="margin-left:50upx;" class="admin-button-com big blue" @click="savePrice">保存修改</view>
+		</view>
+
+		<modal-module :show="batchModel" @click="affirmBatch" title="批量操作" color="#333" :size="32" padding="30rpx 30rpx" >
+			<template slot="customContent">
+				<view class="select-cmd_bx">
+					<view class="num_bx" style="margin:60upx 0 60upx 0;font-size:35upx;">
+						<view class="flex">
+						<input v-model="batchNum" placeholder="填写数值" 
+						type="digit" style="border:1upx solid #CCCCCC;height:60upx;margin:0 auto;text-align:center;" />
+						</view>
+					</view>
+				</view>
+			</template>
+		</modal-module>
+
+	</view>
+</template>
+<script>
+import AppWrapperEmpty from "@/components/app-wrapper-empty";
+import { productList,batchChangeMore } from '@/api/product'
+import list from '@/mixins/list'
+import ModalModule from "@/components/plugin/modal";
+export default {
+	name: "more",
+	components: {
+		AppWrapperEmpty,ModalModule
+	},
+	mixins:[list],
+	data() {
+		return {
+            batchModel:false,
+            batchNum:''
+		};
+	},
+	methods: {
+		goBack(){
+			uni.navigateBack()
+		},
+		clear(item){
+			item.inTurn=''
+			this.$forceUpdate()
+		},
+		affirmBatch(val) {
+            let that = this
+			if (val.index === 0) {
+                this.batchNum = ''
+				this.batchModel = false;
+			} else {
+                if(this.$util.isMoney(this.batchNum) == false){
+                    this.$msg('请填写数值')
+                    return false
+                }
+                let currentNum = Number(this.batchNum)
+                this.list.data.forEach(function(value,index,array){
+					array[index].inTurn =  parseFloat((currentNum).toFixed(2))
+				});
+                this.batchNum = ''
+                this.batchModel = false;
+			}
+		},
+        savePrice(){
+           let that = this
+           let addData = [];
+           uni.showLoading({mask:true})
+		   let mayStop = false
+           this.list.data.forEach(function(value,index,array){
+				if(that.$util.isMoney(value.inTurn) == false){
+					that.$msg('请填写 '+value.name+' 顺序值')
+					mayStop = true
+					return false
+				}
+				addData.push({id:value.id,inTurn:value.inTurn})
+           })
+		   if(mayStop == true){
+			return false
+		   }
+           let addString = JSON.stringify(addData)
+           batchChangeMore({addData:addString}).then(res=>{
+               uni.hideLoading()
+               if(res.code == 1){
+					that.$msg(res.msg)
+					that.resetList();
+					that.init()
+               }
+           })
+        },
+		async init(){
+			const res = await productList({
+				page:this.list.page,showPage:1,pageSize:2000,classId:this.option.classId
+			})
+			this.completes(res)
+		}
+	},
+	async onPullDownRefresh() {
+		this.resetList();
+		await this.init()
+		uni.stopPullDownRefresh();
+	},
+	async onReachBottom() {
+		if (!this.list.finished) {
+			await this.init()
+			uni.stopPullDownRefresh();;
+		} else {
+			uni.stopPullDownRefresh();
+		}
+	},
+	
+};
+</script>
+<style lang="scss" scoped>
+</style>

+ 654 - 0
hdApp/src/admin/itemClass/pull.vue

@@ -0,0 +1,654 @@
+<template>
+	<view class="app-content">
+		<view v-if="!$util.isEmpty(list.data)" style="padding-bottom:120upx;">
+			<view class="sort-list-wrap">
+				<block v-for="(item, index) in list.data" :key="item.id">
+					<view
+						class="sort-item"
+						:class="{
+							dragging: draggedIndex === index,
+							'target-position': targetIndex === index && isDragging && targetIndex !== draggedIndex
+						}"
+						:style="{
+							transform: transformStyle(index),
+							transition: isDragging ? 'none' : 'transform 0.3s ease',
+							zIndex: draggedIndex === index ? 999 : targetIndex === index && isDragging ? 888 : 1
+						}"
+					>
+						<!-- 可拖拽的内容区域 -->
+					<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">
+							<!-- 置顶 -->
+							<view
+								v-if="index > 0"
+								class="move-btn move-btn-top"
+								:class="{ disabled: isOperating }"
+								@click.stop="topFn(item.id)"
+								title="置顶"
+							>
+								<zui-svg-icon icon="general-top-line" color="#fff" :width="20" :height="20" />
+							</view>
+
+							<!-- 置底 -->
+							<view
+								v-if="index < list.data.length - 1"
+								class="move-btn move-btn-bottom"
+								:class="{ disabled: isOperating }"
+								@click.stop="bottomFn(item.id)"
+								title="置底"
+							>
+								<zui-svg-icon icon="general-bottom-line" color="#fff" :width="20" :height="20" />
+							</view>
+
+							<!-- 上移 -->
+							<text
+								v-if="index > 0"
+								class="move-btn move-btn-up"
+								:class="{ disabled: isOperating }"
+								@click.stop="upFn(item.id)"
+								title="上移一位"
+							>↑</text>
+
+							<!-- 下移 -->
+							<text
+								v-if="index < list.data.length - 1"
+								class="move-btn move-btn-down"
+								:class="{ disabled: isOperating }"
+								@click.stop="downFn(item.id)"
+								title="下移一位"
+							>↓</text>
+						</view>
+					</view>
+				</block>
+			</view>
+		</view>
+		<view v-else>
+			<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
+		</view>
+	</view>
+</template>
+<script>
+import AppWrapperEmpty from "@/components/app-wrapper-empty";
+import { productList, batchChangeMore } from '@/api/product'
+import list from '@/mixins/list'
+
+export default {
+	name: "more",
+	components: {
+		AppWrapperEmpty
+	},
+	mixins: [list],
+	data() {
+		return {
+			// 拖拽相关状态
+			draggedIndex: -1,
+			draggedItem: null,
+			dragOffsetY: 0,
+			isDragging: false,
+			itemHeight: 160, // 列表项高度,单位upx(实际高度=160upx)
+			startY: 0,
+			scrollTop: 0, // 页面滚动高度
+			originalOrder: [], // 原始顺序,用于拖拽失败时恢复
+			targetIndex: -1, // 目标交换位置的索引
+			isOperating: false, // 防止快速点击操作按钮
+			totalNum: 0 // 总数量
+		};
+	},
+	onPageScroll(e) {
+		// 拖拽期间禁止更新滚动高度
+		if (!this.isDragging) {
+			this.scrollTop = e.scrollTop;
+		}
+	},
+	methods: {
+		goBack() {
+			uni.navigateBack()
+		},
+		
+		// 响应 transform 样式变化
+		transformStyle(index) {
+			if (index === this.draggedIndex) {
+				return 'translateY(0upx)';
+			}
+			return 'translateY(0upx)';
+		},
+
+		// 拖拽开始
+		dragStart(e) {
+			if (this.isDragging) return;
+
+			this.isDragging = true;
+
+			const index = parseInt(e.currentTarget.dataset.index);
+			if (isNaN(index) || index < 0 || index >= this.list.data.length) {
+				this.isDragging = false;
+				return;
+			}
+
+			this.draggedIndex = index;
+			this.draggedItem = this.list.data[index];
+			this.startY = e.touches[0].clientY;
+			this.targetIndex = index;
+
+			// 保存原始顺序
+			this.originalOrder = [...this.list.data];
+
+			// 添加拖拽模式样式
+			this.toggleDragMode(true);
+
+			if (e.preventDefault) {
+				e.preventDefault();
+			}
+			if (e.stopPropagation) {
+				e.stopPropagation();
+			}
+			return false;
+		},
+
+		// 拖拽移动
+		dragMove(e) {
+			if (!this.isDragging || this.draggedIndex === -1) return;
+
+			if (!e.touches || !e.touches[0]) return;
+
+			if (e.preventDefault) {
+				e.preventDefault();
+			}
+			if (e.stopPropagation) {
+				e.stopPropagation();
+			}
+
+			const currentY = e.touches[0].clientY;
+			const deltaY = currentY - this.startY;
+
+			// 根据设备像素比例转换为upx单位
+			const systemInfo = uni.getSystemInfoSync();
+			const pixelRatio = 750 / systemInfo.windowWidth;
+			const deltaYupx = deltaY * pixelRatio;
+
+			// 限制拖拽范围
+			const maxOffset = (this.list.data.length - 1 - this.draggedIndex) * this.itemHeight;
+			const minOffset = -this.draggedIndex * this.itemHeight;
+			const limitedOffset = Math.max(minOffset, Math.min(maxOffset, deltaYupx));
+
+			this.dragOffsetY = limitedOffset;
+
+			// 实时计算目标位置
+			const moveItems = Math.round(limitedOffset / this.itemHeight);
+			this.targetIndex = Math.max(0, Math.min(this.list.data.length - 1, this.draggedIndex + moveItems));
+		},
+
+		// 拖拽结束
+		dragEnd() {
+			if (!this.isDragging) return;
+
+			// 计算最终位置
+			const moveItems = Math.round(this.dragOffsetY / this.itemHeight);
+			const targetIndex = Math.max(0, Math.min(this.list.data.length - 1, this.draggedIndex + moveItems));
+
+			// 如果位置有变化,则更新数组
+			if (targetIndex !== this.draggedIndex) {
+				const newData = [...this.list.data];
+				const draggedItem = newData[this.draggedIndex];
+
+				newData.splice(this.draggedIndex, 1);
+				newData.splice(targetIndex, 0, draggedItem);
+
+				this.list.data = newData;
+				// 拖拽结束后立即保存
+				this.saveOrder();
+			}
+
+			// 移除拖拽模式样式
+			this.toggleDragMode(false);
+
+			// 重置拖拽状态
+			this.draggedIndex = -1;
+			this.draggedItem = null;
+			this.dragOffsetY = 0;
+			this.isDragging = false;
+			this.startY = 0;
+			this.originalOrder = [];
+			this.targetIndex = -1;
+		},
+
+		// 切换拖拽模式
+		toggleDragMode(isDragging) {
+			// #ifdef H5
+			if (isDragging) {
+				document.body.classList.add('dragging-mode');
+			} else {
+				document.body.classList.remove('dragging-mode');
+			}
+			// #endif
+
+			// #ifdef MP-WEIXIN
+			if (typeof uni.setPageStyle !== 'function') {
+				console.warn('uni.setPageStyle is not available on this platform.');
+				return;
+			}
+
+			if (isDragging) {
+				uni.setPageStyle({
+					style: {
+						overflow: 'hidden',
+						position: 'fixed',
+						width: '100%',
+						top: `-${this.scrollTop}px`,
+						left: '0',
+						right: '0'
+					}
+				});
+			} else {
+				uni.setPageStyle({
+					style: {
+						overflow: '',
+						position: '',
+						width: '',
+						top: '',
+						left: '',
+						right: ''
+					}
+				});
+				uni.pageScrollTo({
+					scrollTop: this.scrollTop,
+					duration: 0
+				});
+			}
+			// #endif
+
+			// #ifdef APP-PLUS
+			const webview = this.$scope.$getAppWebview();
+			if (!webview) {
+				console.warn('无法获取 webview。');
+				return;
+			}
+
+			if (isDragging) {
+				webview.evalJS(`
+					var body = document.body;
+					body.style.overflow = 'hidden';
+					body.style.position = 'fixed';
+					body.style.width = '100%';
+					body.style.left = '0';
+					body.style.right = '0';
+					body.style.top = '-${this.scrollTop}px';
+				`);
+			} else {
+				webview.evalJS(`
+					var body = document.body;
+					body.style.overflow = '';
+					body.style.position = '';
+					body.style.width = '';
+					body.style.left = '';
+					body.style.right = '';
+					body.style.top = '';
+				`);
+				uni.pageScrollTo({
+					scrollTop: this.scrollTop,
+					duration: 0
+				});
+			}
+			// #endif
+		},
+
+		// 上移
+		upFn(id) {
+			if (this.isOperating) return;
+			this.isOperating = true;
+
+			const index = this.list.data.findIndex((item) => item.id === id);
+			if (index > 0) {
+				const newData = [...this.list.data];
+				const temp = newData[index];
+				newData[index] = newData[index - 1];
+				newData[index - 1] = temp;
+				this.list.data = newData;
+				// 操作后立即保存
+				this.saveOrder();
+			}
+
+			setTimeout(() => {
+				this.isOperating = false;
+			}, 300);
+		},
+
+		// 下移
+		downFn(id) {
+			if (this.isOperating) return;
+			this.isOperating = true;
+
+			const index = this.list.data.findIndex((item) => item.id === id);
+			if (index < this.list.data.length - 1) {
+				const newData = [...this.list.data];
+				const temp = newData[index];
+				newData[index] = newData[index + 1];
+				newData[index + 1] = temp;
+				this.list.data = newData;
+				// 操作后立即保存
+				this.saveOrder();
+			}
+
+			setTimeout(() => {
+				this.isOperating = false;
+			}, 300);
+		},
+
+		// 置顶
+		topFn(id) {
+			if (this.isOperating) return;
+			this.isOperating = true;
+
+			const index = this.list.data.findIndex((item) => item.id === id);
+			if (index > 0) {
+				const newData = [...this.list.data];
+				const targetItem = newData[index];
+
+				newData.splice(index, 1);
+				newData.unshift(targetItem);
+
+				this.list.data = newData;
+				// 操作后立即保存
+				this.saveOrder();
+			}
+
+			setTimeout(() => {
+				this.isOperating = false;
+			}, 300);
+		},
+
+		// 置底
+		bottomFn(id) {
+			if (this.isOperating) return;
+			this.isOperating = true;
+
+			const index = this.list.data.findIndex((item) => item.id === id);
+			if (index < this.list.data.length - 1) {
+				const newData = [...this.list.data];
+				const targetItem = newData[index];
+
+				newData.splice(index, 1);
+				newData.push(targetItem);
+
+				this.list.data = newData;
+				// 操作后立即保存
+				this.saveOrder();
+			}
+
+			setTimeout(() => {
+				this.isOperating = false;
+			}, 300);
+		},
+
+		// 保存排序
+		saveOrder() {
+			let that = this;
+			const sortData = this.list.data.map((item, index) => ({
+				id: item.id,
+				inTurn: this.list.data.length - index // 反向索引,第一个有最大值
+			}));
+			batchChangeMore({ addData: JSON.stringify(sortData) }).then(res => {
+				if (res.code == 1) {
+					//that.$msg('已保存')
+				}
+			})
+		},
+
+		async init() {
+			const res = await productList({
+				page: this.list.page,
+				showPage: 1,
+				pageSize: 2000,
+				classId: this.option.classId
+			});
+			this.completes(res);
+			this.totalNum = res.data && res.data.total ? Number(res.data.total) : this.list.data.length;
+		}
+	},
+	async onPullDownRefresh() {
+		this.resetList();
+		await this.init();
+		uni.stopPullDownRefresh();
+	},
+	async onReachBottom() {
+		if (!this.list.finished) {
+			await this.init();
+			uni.stopPullDownRefresh();
+		} else {
+			uni.stopPullDownRefresh();
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.app-content {
+	min-height: 100vh;
+	padding-bottom: 20upx;
+}
+
+.sort-list-wrap {
+	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-content {
+				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;
+			margin-left: auto;
+		}
+		}
+}
+
+.move-btn {
+	position: relative;
+	display: inline-flex;
+	align-items: center;
+	justify-content: center;
+	width: 50upx;
+	height: 50upx;
+	color: #fff;
+	background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+	border: 2px solid rgba(255, 255, 255, 0.3);
+	border-radius: 50%;
+	font-size: 24upx;
+	font-weight: bold;
+	box-shadow: 0 3upx 10upx rgba(102, 126, 234, 0.25);
+	transition: all 0.2s ease;
+	z-index: 10;
+	cursor: pointer;
+	flex-shrink: 0;
+	/* #ifdef MP-WEIXIN || APP-PLUS || MP-ALIPAY */
+	user-select: none;
+	-webkit-user-select: none;
+	-webkit-touch-callout: none;
+	/* #endif */
+
+	/* 触摸反馈 */
+	&:active {
+		transform: scale(0.92);
+		box-shadow: 0 2upx 6upx rgba(102, 126, 234, 0.4);
+	}
+
+	/* 悬停效果 - 仅在 H5 显示 */
+	/* #ifdef H5 */
+	&:hover:not(.disabled) {
+		transform: translateY(-2upx);
+		box-shadow: 0 4upx 15upx rgba(102, 126, 234, 0.35);
+	}
+	/* #endif */
+}
+
+/* 置顶按钮 - 黄色渐变 */
+.move-btn-top {
+	background: linear-gradient(135deg, #feca57 0%, #ff9ff3 100%);
+	box-shadow: 0 3upx 10upx rgba(254, 202, 87, 0.25);
+
+	&:active {
+		box-shadow: 0 2upx 6upx rgba(254, 202, 87, 0.4);
+	}
+
+	/* #ifdef H5 */
+	&:hover:not(.disabled) {
+		box-shadow: 0 4upx 15upx rgba(254, 202, 87, 0.35);
+	}
+	/* #endif */
+}
+
+/* 置底按钮 - 黄色渐变 */
+.move-btn-bottom {
+	background: linear-gradient(135deg, #feca57 0%, #ff9ff3 100%);
+	box-shadow: 0 3upx 10upx rgba(254, 202, 87, 0.25);
+
+	&:active {
+		box-shadow: 0 2upx 6upx rgba(254, 202, 87, 0.4);
+	}
+
+	/* #ifdef H5 */
+	&:hover:not(.disabled) {
+		box-shadow: 0 4upx 15upx rgba(254, 202, 87, 0.35);
+	}
+	/* #endif */
+}
+
+/* 上移按钮 - 青色渐变 */
+.move-btn-up {
+	background: linear-gradient(135deg, #48dbfb 0%, #0abde3 100%);
+	box-shadow: 0 3upx 10upx rgba(72, 219, 251, 0.25);
+
+	&:active {
+		box-shadow: 0 2upx 6upx rgba(72, 219, 251, 0.4);
+	}
+
+	/* #ifdef H5 */
+	&:hover:not(.disabled) {
+		box-shadow: 0 4upx 15upx rgba(72, 219, 251, 0.35);
+	}
+	/* #endif */
+}
+
+/* 下移按钮 - 青色渐变 */
+.move-btn-down {
+	background: linear-gradient(135deg, #48dbfb 0%, #0abde3 100%);
+	box-shadow: 0 3upx 10upx rgba(72, 219, 251, 0.25);
+
+	&:active {
+		box-shadow: 0 2upx 6upx rgba(72, 219, 251, 0.4);
+	}
+
+	/* #ifdef H5 */
+	&:hover:not(.disabled) {
+		box-shadow: 0 4upx 15upx rgba(72, 219, 251, 0.35);
+	}
+	/* #endif */
+}
+
+/* 按钮禁用状态 */
+.move-btn.disabled {
+	opacity: 0.5;
+	transform: none !important;
+	box-shadow: 0 2upx 6upx rgba(0, 0, 0, 0.08) !important;
+	pointer-events: none;
+	cursor: not-allowed;
+	&:hover,
+	&:active {
+		transform: none !important;
+		box-shadow: 0 2upx 6upx rgba(0, 0, 0, 0.08) !important;
+	}
+}
+
+// 拖拽相关样式
+.sort-list-wrap .sort-item.dragging {
+	border: 2px dashed #007aff !important;
+	box-shadow: 0 8upx 40upx rgba(0, 122, 255, 0.25) !important;
+	background-color: rgba(0, 122, 255, 0.08) !important;
+	opacity: 0.9;
+	border-radius: 16upx;
+	transform: scale(1.02);
+	transition: none !important; /* 拖拽时禁用过渡动画 */
+}
+
+.sort-list-wrap .sort-item.target-position {
+	border: 3px solid #52c41a !important; /* 使用绿色边框区别于拖拽元素 */
+	box-shadow: 0 6upx 30upx rgba(82, 196, 26, 0.3) !important;
+	background-color: rgba(82, 196, 26, 0.1) !important;
+	opacity: 0.95;
+	border-radius: 16upx;
+	transform: scale(1.01);
+	transition: all 0.2s ease !important; /* 目标位置保持平滑过渡 */
+
+	/* 添加一个内部指示器 */
+	&::before {
+		content: '移动到这儿';
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		padding: 8upx 22upx;
+		background: linear-gradient(90deg, #52c41a, #73d13d);
+		border-radius: 8upx;
+		color: #fff;
+		font-size: 26upx;
+		font-weight: bold;
+		opacity: 0.9;
+		z-index: 99990;
+	}
+}
+
+/* 防止拖拽时页面滚动 */
+.dragging-mode {
+	overflow: hidden !important;
+	touch-action: none !important;
+	-webkit-overflow-scrolling: auto !important;
+}
+</style>

+ 146 - 0
hdApp/src/admin/itemClass/sort.vue

@@ -0,0 +1,146 @@
+<template>
+	<view class="app-content">
+		<view class="list-wrap">
+			<block v-if="!$util.isEmpty(list.data)">
+				<view class="list" v-for="(item, index) in list.data" :key="index">
+					<view class="list-index">{{ item.id }}</view>
+					<view class="list-item">
+						<view class="app-size-28 app-color-0" style="font-size:30upx;font-weight:bold;color:#333333;">
+						{{ item.name || '' }}
+						</view>
+					</view>
+					<button class="admin-button-com blue middle" @click.stop="pageTo('/admin/itemClass/pull?classId='+item.id)">拖拽排序</button>
+					<button class="admin-button-com blue middle" @click.stop="pageTo('/admin/itemClass/num?classId='+item.id)">数字排序</button>
+				</view>
+			</block>
+			<block v-else>
+				<app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
+			</block>
+		</view>
+	</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 { list } from '@/mixins'
+import { getList} from '@/api/item-class'
+export default {
+	name: 'add',
+	components: {
+		ModalModule,
+		AppUploader,
+		OperateModule,
+		AppWrapperEmpty
+	},
+	mixins: [list],
+	data() {
+		return {
+			modifyModal: false,
+			modifyTitle: '添加',
+			replaceForm: {
+				name: '',
+				id:0,
+				inTurn: 100
+			},
+			delModal: false,
+			operateShow: false,
+			operateData: {},
+			operateIndex: null,
+			operateTop: 0
+		}
+	},
+	onPullDownRefresh() {
+		this.resetList()
+		this._list().then(res => {
+			uni.stopPullDownRefresh()
+		})
+	},
+	onReachBottom() {
+		if (!this.list.finished) {
+			this._list().then(res => {
+				uni.stopPullDownRefresh()
+			})
+		} else {
+			uni.stopPullDownRefresh()
+		}
+	},
+	onLoad() {
+	},
+	methods: {
+		async init() {
+			this._list()
+		},
+		_list() {
+			return getList({page: this.list.page}).then(res => {
+				this.completes(res)
+			})
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+	.app-content {
+		min-height: calc(100vh - 100upx);
+		padding-bottom: 100upx;
+	}
+	.list-wrap {
+		position: relative;
+		background-color: #fff;
+		.list {
+			height: 130upx;
+			@include disFlex(center, flex-start);
+			margin: 0 30upx 0 30upx;
+			color: $fontColor3;
+			border-bottom: 1upx solid $borderColor;
+			.list-index {
+				width: 80upx;
+				flex-shrink: 0;
+			}
+			.list-img {
+				img {
+					height: 100%;
+				}
+			}
+			.list-item {
+				flex: 1;
+				margin-left: 10upx;
+				position: relative;
+				& > div {
+					margin-top: 14upx;
+					&:first-child {
+						margin-top: 0;
+					}
+				}
+			}
+			button {
+				flex-shrink: 0;
+				margin-left: 20upx;
+			}
+		}
+	}
+	.app-footer {
+		justify-content: flex-end;
+		.admin-button-com {
+			width: 200upx;
+			margin-right: 30upx;
+		}
+	}
+	.modify-modal {
+		.prompt-text {
+			color: red;
+			position: relative;
+			right: 52upx;
+			bottom: 24upx;
+		}
+		.line-label {
+			width: 140upx;
+			flex-shrink: 0;
+		}
+		.switch-wrap {
+			margin-top: 30upx;
+		}
+	}
+</style>

+ 2 - 2
hdApp/src/admin/ptItem/components/Item.vue

@@ -24,8 +24,8 @@
 			<view class="num-open_bx">
 				<view class="open-bx warn">
 					<text>编号 {{info.id}}</text>
-					<text style="margin-left:25upx;" v-if="info.ratioType == 0">{{info.ratio}}{{info.smallUnit}}/<text @click="changeAuth(info.id)">{{ info.bigUnit }}</text></text>
-					<text style="margin-left:25upx;" v-else>若干{{info.smallUnit}}/<text @click="changeAuth(info.id)">{{ info.bigUnit }}</text></text>
+					<text style="margin-left:25upx;color:#3385FF;font-weight:bold;" v-if="info.ratioType == 0">{{info.ratio}}{{info.smallUnit}}/<text @click="changeAuth(info.id)">{{ info.bigUnit }}</text></text>
+					<text style="margin-left:25upx;color:#3385FF;font-weight:bold;" v-else>若干{{info.smallUnit}}/<text @click="changeAuth(info.id)">{{ info.bigUnit }}</text></text>
 				</view>
 			</view>
 		</view>

+ 1 - 3
hdApp/src/admin/ptItem/itemList.vue

@@ -126,9 +126,7 @@ export default {
 					})
 					return
 				}
-				this.$util.confirmModal({content:'确认采用?'},() => {
-					this.$util.pageTo({ url: '/admin/item/detail',type:2,query:{ptItemId:item.id}})
-				})
+				this.$util.pageTo({ url: '/admin/item/detail',type:2,query:{ptItemId:item.id}})
 			}
 		},
 		affirm(val) {

+ 4 - 0
hdApp/src/api/item-class/index.js

@@ -18,4 +18,8 @@ export const getAllItemClass = data => {
 
 export const getMenu = data => {
 	return https.get('/item-class/get-menu', data)
+}
+
+export const delClass = data => {
+	return https.get('/item-class/delete', data)
 }

+ 4 - 0
hdApp/src/api/product/index.js

@@ -30,6 +30,10 @@ export const getGhsProductDetail = data => {
 	return https.get('/product/ghs-product-detail', data)
 }
 
+export const batchChangeMore = data => {
+	return https.post("/product/batch-change-more", data);
+}
+
 /** *
  * 分类及花材数据(库存预警、库存管理共用这个接口)
  * @parmas py 花材拼音

+ 4 - 1
hdApp/src/pages.json

@@ -114,7 +114,10 @@
 			"pages": [
 				{"path": "list","style": {"navigationBarTitleText": "花材分类"}},
 				{"path": "addPrice","style": {"navigationBarTitleText": "加价设置"}},
-				{"path": "more","style": {"navigationBarTitleText": "更多"}}
+				{"path": "more","style": {"navigationBarTitleText": "更多"}},
+				{"path": "sort","style": {"navigationBarTitleText": "花材排序"}},
+				{"path": "num","style": {"navigationBarTitleText": "数量排序"}},
+				{"path": "pull","style": {"navigationBarTitleText": "拖拽排序"}}
 			]
 		},
 		{

+ 1 - 1
hdApp/src/pagesPurchase/ghsProduct.vue

@@ -75,7 +75,7 @@
 									<text style="font-weight:bold;" v-if="Number(productItem.reachNum)>0">
 										满{{productItem.reachNum}}扎,每扎优惠 ¥{{parseFloat(productItem.reachNumDiscount)}}<block v-if="productItem.presell == 0">(提交订单后优惠)</block>
 									</text>
-									<block v-if="productItem.presell && productItem.presell == 1"><block v-if="Number(productItem.reachNum)>0">,</block>到货日期
+									<block v-if="productItem.presell && productItem.presell == 1"><block v-if="Number(productItem.reachNum)>0">,</block>到货日期
 										<block v-if="!$util.isEmpty(productItem.presellDateShow)">
 											<text v-for="(dateItem, dateIndex) in productItem.presellDateShow" :key="dateIndex" style="">{{dateItem}}<text v-if="dateIndex!=productItem.presellDateShow.length-1">,</text></text>
 										</block>

+ 1 - 1
hdApp/src/pagesPurchase/ghsProduct2.vue

@@ -71,7 +71,7 @@
 									<text style="font-weight:bold;" v-if="Number(productItem.reachNum)>0">
 										满{{productItem.reachNum}}扎 ¥{{productItem.reachPrice}}<block v-if="productItem.presell == 0">(提交订单后优惠)</block>
 									</text>
-									<block v-if="productItem.presell && productItem.presell == 1"><block v-if="Number(productItem.reachNum)>0">,</block>到货日期
+									<block v-if="productItem.presell && productItem.presell == 1"><block v-if="Number(productItem.reachNum)>0">,</block>到货日期
 										<block v-if="!$util.isEmpty(productItem.presellDateShow)">
 											<text v-for="(dateItem, dateIndex) in productItem.presellDateShow" :key="dateIndex" style="">{{dateItem}}<text v-if="dateIndex!=productItem.presellDateShow.length-1">,</text></text>
 										</block>

+ 17 - 3
hdApp/src/pagesPurchase/particulars.vue

@@ -8,12 +8,20 @@
         <button class="admin-button-com big" style="width:70vw;" @click="goDetail">订单详情</button>
         <button v-if="ghsCgScene!=''" class="admin-button-com big" style="width:70vw;margin-top:18upx;" @click="goHome">返回首页</button>
         <button v-else class="admin-button-com big" style="width:70vw;margin-top:18upx;" @click="goBack">返回</button>
-        <view style="margin-top:15upx;">
+
+        <view style="margin-top:15upx;" v-if="showFirstGuide">
           <view style="font-size:28upx;">微信下拉,搜索小程序 花掌柜,可再次买花</view>
           <view style="margin-bottom:30upx;margin-top:15upx;">
-            <image class="image" :src="`${constant.imgUrl}/cg/hd_cg_route3.png`" mode="widthFix"></image>
+            <image style="width:70vw;" :src="`${constant.imgUrl}/cg/hd_cg_route3.png`" mode="widthFix"></image>
+          </view>
+        </view>
+
+        <view style="margin-top:10upx;" v-else>
+          <view style="margin-bottom:10upx;margin-top:10upx;">
+            <image style="width:86vw;" :src="`${constant.imgUrl}/cg/hd_cg_route4.png`" mode="widthFix"></image>
           </view>
         </view>
+
       </view>
       <!-- #ifdef MP-WEIXIN -->
       <view style="width:690upx;height:25upx;background-color: #f5f5f5;"></view>
@@ -36,12 +44,18 @@ export default {
       currentEnv:'production',
       fromCg:0,
       flowersList:[],
-      onlyCg:1
+      onlyCg:1,
+      showFirstGuide:true
     }
   },
   onLoad () {
     this.hasInit = true
 
+    const storageKey = 'particularsVisitCount'
+    let visitCount = Number(uni.getStorageSync(storageKey) || 0) + 1
+    uni.setStorageSync(storageKey, visitCount)
+    this.showFirstGuide = visitCount <= 3
+
     //供货商打开太阳码分享给客户,客户需要采购进来
     let scene = uni.getStorageSync('ghsCgScene')
     if(scene){

+ 1 - 5
hdApp/src/pagesPurchase/wechatPay.vue

@@ -54,10 +54,6 @@
         </div>
         <!-- #endif -->
 
-        <view style="margin-top:60upx;margin-bottom:20upx;">
-          <image style="width:75%;margin:0 auto;" :src="`${constant.imgUrl}/cg/use_hzg.png`" mode="widthFix"></image>
-        </view>
-
         </block>
       </div>
     </div>
@@ -190,7 +186,7 @@ export default {
             if (sweixin && sweixin.nativeClient) {
               sweixin.launchMiniProgram({
                 id: miniOriginalId,
-                path: '/pagesPurchase/order',
+                path: '/admin/home/workbench',
                 type: 0
               });
             } else {

+ 1 - 1
mallApp/src/pages/item/detail.vue

@@ -22,7 +22,7 @@
       </view>
       <view class="shop-express app-color-3" v-if="data.presell == 1">
         <view>
-          到货日期
+          到货日期:
           <block v-if="!$util.isEmpty(data.presellDateShow)">
             <text v-for="(dateItem, dateIndex) in data.presellDateShow" :key="dateIndex" style="">{{dateItem}}<text v-if="dateIndex!=data.presellDateShow.length-1">,</text></text>
           </block>