Merge branch 'master' of git.huaml.com:zhh/front-end

ghsApp/src/admin/billing/affirm.vue

@@ -115,6 +115,22 @@
             <view class="tui-title">客户</view>
             <view class="tui-input">{{ form.customName }}</view>
           </tui-list-cell>
+
+          <tui-list-cell class="line-cell" :hover="false" :arrow="false">
+            <view class="tui-title">收款方式</view>
+            <button @click="form.hasPay = 2" class="admin-button-com big" :class="form.hasPay == 2 ? 'blue' : 'default'" style="margin-right:16upx;">赊账</button>
+            <button @click="form.hasPay = 0" class="admin-button-com big" :class="form.hasPay == 0 ? 'blue' : 'default'" style="margin-right:16upx;">扫码分享</button>
+            <button @tap="form.hasPay = 1" class="admin-button-com big" :class="form.hasPay == 1 ? 'blue' : 'default'" style="margin-right:0upx;">线下</button>
+          </tui-list-cell>
+
+          <tui-list-cell class="line-cell" :arrow="true" v-if="form.hasPay == 1">
+            <div class="tui-title">线下方式</div>
+            <picker mode="selector" :value="form.payWay" :range="payWayList" range-key="name" @change="payWayChange" class="tui-input" >
+              <input v-model="form.payWay" name="payWay" type="text" hidden />
+              <div style="padding:6upx 0 6upx 0;">{{payWayList[payWayindex].name}}</div>
+            </picker>
+          </tui-list-cell>
+
           <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-show="displayPackCost == true">
             <view class="tui-title">打包费</view>
             <input type="digit" placeholder="请填写打包费" v-model="form.packCost" placeholder-class="tui-placeholder"/>
@@ -150,21 +166,6 @@
             <input type="digit" placeholder="请填写运费" v-model="form.sendCost" placeholder-class="tui-placeholder"/>
           </tui-list-cell>
 
-          <tui-list-cell class="line-cell" :hover="false" :arrow="false">
-            <view class="tui-title">收款方式</view>
-            <button @click="form.hasPay = 2" class="admin-button-com big" :class="form.hasPay == 2 ? 'blue' : 'default'" style="margin-right:16upx;">赊账</button>
-            <button @click="form.hasPay = 0" class="admin-button-com big" :class="form.hasPay == 0 ? 'blue' : 'default'" style="margin-right:16upx;">扫码分享</button>
-            <button @tap="form.hasPay = 1" class="admin-button-com big" :class="form.hasPay == 1 ? 'blue' : 'default'" style="margin-right:0upx;">线下</button>
-          </tui-list-cell>
-
-          <tui-list-cell class="line-cell" :arrow="true" v-if="form.hasPay == 1">
-            <div class="tui-title">线下方式</div>
-            <picker mode="selector" :value="form.payWay" :range="payWayList" range-key="name" @change="payWayChange" class="tui-input" >
-              <input v-model="form.payWay" name="payWay" type="text" hidden />
-              <div style="padding:6upx 0 6upx 0;">{{payWayList[payWayindex].name}}</div>
-            </picker>
-          </tui-list-cell>
-
           <tui-list-cell class="line-cell" :hover="false" :arrow="false">
             <view class="tui-title">打印小票</view>
             <button @click="form.needPrint = 1" class="admin-button-com big" :class="form.needPrint == 1 ? 'blue' : 'default'">打印</button>

ghsApp/src/admin/home/me.vue

@@ -53,7 +53,7 @@
             <view class="info-lf_box">
               <view>
                 账户余额（元）
-                <text style="float:right;margin-right:25upx;font-size:28upx;" @click.stop="callFast(1)">紧急联系电话</text>
+                <text style="float:right;margin-right:25upx;font-size:28upx;" @click.stop="callFast(1)">联系客服</text>
               </view>
               <view> <text>¥ </text> {{ myInfo.balance||0 }} </view>
               <view>
@@ -70,7 +70,7 @@
           <view class="info-lf_box">
             <view>
               现金（元）
-              <text style="float:right;margin-right:25upx;font-size:28upx;" @click.stop="callFast(1)">紧急联系电话</text>
+              <text style="float:right;margin-right:25upx;font-size:28upx;" @click.stop="callFast(1)">联系客服</text>
             </view>
             <view> <text>¥ </text> {{ myInfo.money||0 }} </view>
             <view>

hdApp/src/admin/billing/affirm.vue

@@ -122,26 +122,12 @@
             </view>
           </tui-list-cell>
 
-          <tui-list-cell class="line-cell" :hover="false" :arrow="false">
-            <view class="tui-title">配送方式</view>
-            <button style="margin-right:16upx;height:70upx;line-height:46upx;" @tap="setSendType(1)" class="admin-button-com mini-btn" :class="form.sendType == 1 ? 'blue' : 'default'">自取</button>
-            <button style="margin-right:16upx;height:70upx;line-height:46upx;" @tap="setSendType(0)" class="admin-button-com mini-btn" :class="form.sendType == 0 ? 'blue' : 'default'">送货</button>
-            <button style="margin-right:16upx;height:70upx;line-height:46upx;" @click="setSendType(2)" class="admin-button-com mini-btn" :class="form.sendType == 2 ? 'blue' : 'default'">跑腿</button>
-            <button style="margin-right:0upx;height:70upx;line-height:46upx;" @click="setSendType(3)" class="admin-button-com mini-btn" :class="form.sendType == 3 ? 'blue' : 'default'">物流</button>
-          </tui-list-cell>
-
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
-						<view class="tui-title">结账方式</view>
-						<view class="payment-buttons">
-							<view class="button-row">
-                <button @click="form.hasPay = 4" class="admin-button-com middle" :class="form.hasPay == 4 ? 'blue' : 'default'">余额</button>
-                <button @click="form.hasPay = 0" class="admin-button-com middle" :class="form.hasPay == 0 ? 'blue' : 'default'">扫码分享</button>
-							</view>
-							<view class="button-row">
-                <button @tap="form.hasPay = 1" class="admin-button-com middle" :class="form.hasPay == 1 ? 'blue' : 'default'">线下</button>
-								<button @click="form.hasPay = 2" class="admin-button-com middle" :class="form.hasPay == 2 ? 'blue' : 'default'">赊账</button>
-							</view>
-						</view>
+						<view class="tui-title">收款方式</view>
+            <button style="margin-right:16upx;height:70upx;line-height:46upx;" @click="form.hasPay = 4" class="admin-button-com mini-btn" :class="form.hasPay == 4 ? 'blue' : 'default'">余额</button>
+            <button style="margin-right:16upx;height:70upx;line-height:46upx;" @click="form.hasPay = 0" class="admin-button-com mini-btn" :class="form.hasPay == 0 ? 'blue' : 'default'">扫码</button>
+            <button style="margin-right:16upx;height:70upx;line-height:46upx;" @tap="form.hasPay = 1" class="admin-button-com mini-btn" :class="form.hasPay == 1 ? 'blue' : 'default'">线下</button>
+            <button style="margin-right:0upx;height:70upx;line-height:46upx;" @click="form.hasPay = 2" class="admin-button-com mini-btn" :class="form.hasPay == 2 ? 'blue' : 'default'">赊账</button>
 					</tui-list-cell>
 
           <tui-list-cell class="line-cell" :hover="false" :arrow="true" v-if="form.hasPay == 1">
@@ -156,9 +142,11 @@
           </tui-list-cell>
 
           <tui-list-cell class="line-cell" :hover="false" :arrow="false">
-            <view class="tui-title">打印小票</view>
-            <button @tap="form.needPrint = 2" class="admin-button-com middle" style="width:140upx;" :class="form.needPrint == 2? 'blue' : 'default'">不打印</button>
-            <button @click="form.needPrint = 1" class="admin-button-com middle" style="width:140upx;" :class="form.needPrint == 1 ? 'blue' : 'default'">打印</button>
+            <view class="tui-title">配送方式</view>
+            <button style="margin-right:16upx;height:70upx;line-height:46upx;" @tap="setSendType(0)" class="admin-button-com mini-btn" :class="form.sendType == 0 ? 'blue' : 'default'">送货</button>
+            <button style="margin-right:16upx;height:70upx;line-height:46upx;" @tap="setSendType(1)" class="admin-button-com mini-btn" :class="form.sendType == 1 ? 'blue' : 'default'">自取</button>
+            <button style="margin-right:16upx;height:70upx;line-height:46upx;" @click="setSendType(2)" class="admin-button-com mini-btn" :class="form.sendType == 2 ? 'blue' : 'default'">跑腿</button>
+            <button style="margin-right:0upx;height:70upx;line-height:46upx;" @click="setSendType(3)" class="admin-button-com mini-btn" :class="form.sendType == 3 ? 'blue' : 'default'">物流</button>
           </tui-list-cell>
 
           <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="form.sendType == 2">
@@ -166,6 +154,12 @@
             <input type="digit" placeholder="请填写运费" v-model="form.sendCost" placeholder-class="tui-placeholder"/>
           </tui-list-cell>
 
+          <tui-list-cell class="line-cell" :hover="false" :arrow="false">
+            <view class="tui-title">打印小票</view>
+            <button @tap="form.needPrint = 2" class="admin-button-com middle" style="width:140upx;" :class="form.needPrint == 2? 'blue' : 'default'">不打印</button>
+            <button @click="form.needPrint = 1" class="admin-button-com middle" style="width:140upx;" :class="form.needPrint == 1 ? 'blue' : 'default'">打印</button>
+          </tui-list-cell>
+
           <tui-list-cell class="line-cell" :hover="false" :arrow="false" >
             <view class="tui-title">
               <text>合计金额</text>  
@@ -185,7 +179,8 @@
           </tui-list-cell>
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="true">
-						<view class="tui-title">配送日期</view>
+            <view class="tui-title" v-if="form.sendType == 1">取花日期</view>
+						<view class="tui-title" v-else>配送日期</view>
 						<picker mode="date" :value="form.reachDate" @change="bindDateChange" style="width:400upx;">
 							<view class="uni-input" v-if="form.reachDate==''" style="color:#CCCCCC;">请选择，默认当天</view>
 							<view class="uni-input">{{form.reachDate}}</view>
@@ -193,7 +188,8 @@
 					</tui-list-cell>
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="true">
-						<view class="tui-title">配送时间</view>
+            <view class="tui-title" v-if="form.sendType == 1">取花时间</view>
+						<view class="tui-title" v-else>配送时间</view>
 						<picker mode="multiSelector" :range="timeOptions" @change="bindTimeChange">
 							<view class="uni-input" style="width:450upx;">{{form.reachPeriod}}<text style="margin-left:10upx;">前</text></view>
 						</picker>
@@ -219,11 +215,17 @@
 						<textarea style="height:80upx;z-index:0" v-model="form.remark" placeholder-class="remark-class" placeholder="选填" />
 					</tui-list-cell>
 
+          <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="reduceStock == 0">
+            <view class="tui-title">制作</view>
+            <button @tap="form.needWork = 0;" class="admin-button-com mini-btn" style="width:170upx;" :class="form.needWork == 0? 'blue' : 'default'">不要</button>
+            <button @click="form.needWork = 1;" class="admin-button-com mini-btn" style="width:170upx;" :class="form.needWork == 1 ? 'blue' : 'default'">需要</button>
+          </tui-list-cell>
+
           <!-- 如果是扣除库存方式开单，不显示售后付款选项 -->
           <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="reduceStock == 0">
             <view class="tui-title">订单类型</view>
             <button @tap="form.forward = 0;" class="admin-button-com mini-btn" style="width:170upx;" :class="form.forward == 0? 'blue' : 'default'">收入订单</button>
-            <button @click="form.forward = 1;" class="admin-button-com mini-btn" style="width:170upx;" :class="form.forward == 1 ? 'blue' : 'default'">售后付款</button>
+            <button @click="form.forward = 1;" class="admin-button-com mini-btn" style="width:170upx;" :class="form.forward == 1 ? 'blue' : 'default'">支出订单</button>
           </tui-list-cell>
 
           </view>
@@ -366,11 +368,11 @@ export default {
         receiveAddress: "",
         receiveLong: "",
         receiveLat: "",
-        sendType: 1,
+        sendType: 0,
         sendSide: "2",
         sendDate: "",
         reachDate: "",
-				reachPeriod: "22:00",
+		reachPeriod: "12:00",
         historyDate:"",
         sendCost: "",
         customId: "",
@@ -383,6 +385,7 @@ export default {
         getStaffName:'',
         dealPrice:0,
         forward:0,
+        needWork:0,
         forwardStock:1,
         fromType:1//门店来的订单
       },
@@ -662,7 +665,7 @@ export default {
 			let book = this.option.book ? this.option.book : 0
 			let reduceStock = this.option.reduceStock?this.option.reduceStock:0
       params = {...params,orderId:orderId,book:book,reduceStock:reduceStock,version:3}
-
+console.log(params)
       uni.showLoading({mask:true})
       createOrder(params).then((res) => {
         uni.hideLoading()

hdApp/src/admin/billing/components/app-commodity2.vue

@@ -102,7 +102,12 @@ export default {
 	},
 	methods: {
 		addItemFn () {
-			this.$emit("replaceItemFn", this.info,0,'add')
+			//没价格商品并且没有设置userPrice时，不能一个一个添加，只能弹框方式添加
+			if(this.info.priceType == 0 && (this.$util.isEmpty(this.info.userPrice) || Number(this.info.userPrice) == 0)){
+				this.showAddModelFn()
+			}else{
+				this.$emit("replaceItemFn", this.info,0,'add')
+			}			
 		},
 		reduceItemFn() {
 			this.$emit("replaceItemFn", this.info,0,'sub')

hdApp/src/admin/cg/item.vue

@@ -4,15 +4,15 @@
     <view class="img_box" style="margin-top:30upx;">
       <image :src="flowerUrl" mode="heightFix" class="img_url"></image>
     </view>
-    <view style="margin:20upx auto 20upx auto;width:50vw;font-size:35upx;font-weight:bold;text-align:center;">花材绿植</view>
-    <div class="confirm-btn">
+    <view style="margin:20upx auto 20upx auto;width:50vw;font-size:35upx;font-weight:bold;text-align:center;">绿植花材</view>
+    <div class="confirm-btn" style="margin-top:60upx;">
       <button class="admin-button-com big blue" style="width:60vw;" @click="downloadImg(flowerUrl)">保存图片</button>
     </div>
-    <div class="confirm-btn1">
+    <div class="confirm-btn1" style="margin-top:60upx;">
       <button class="admin-button-com big" style="width:60vw;" @click="goToMallPt('pages/item/item')">直接打开</button>
     </div>
 
-    <view class="confirm-btn1" style="margin-top:100upx;">
+    <view class="confirm-btn1" style="margin-top:60upx;">
       <button class="admin-button-com big" style="width:60vw;" @click="copyLink">复制链接</button>
     </view>
 

hdApp/src/admin/cg/mall.vue

@@ -5,17 +5,17 @@
       <image :src="goodsUrl" mode="heightFix" class="img_url"></image>
     </view>
 
-    <view style="margin:20upx auto 20upx auto;width:50vw;font-size:35upx;font-weight:bold;text-align:center;">花束商城</view>
+    <view style="margin:20upx auto 20upx auto;width:50vw;font-size:35upx;font-weight:bold;text-align:center;">花束花篮</view>
 
-    <view class="confirm-btn">
+    <view class="confirm-btn" style="margin-top:60upx;">
       <button class="admin-button-com big blue" style="width:60vw;" @click="downloadImg(goodsUrl)">保存图片</button>
     </view>
 
-    <view class="confirm-btn1">
+    <view class="confirm-btn1" style="margin-top:60upx;">
       <button class="admin-button-com big" style="width:60vw;" @click="goToMallPt('pages/home/category')">直接打开</button>
     </view>
 
-    <view class="confirm-btn1" style="margin-top:100upx;">
+    <view class="confirm-btn1" style="margin-top:60upx;">
       <button class="admin-button-com big" style="width:60vw;" @click="copyLink">复制链接</button>
     </view>
 

hdApp/src/admin/goods/add.vue

@@ -1,12 +1,5 @@
 <template>
   <view class="app-content">
-    <!-- 加载状态 -->
-    <!-- <view v-if="loading" class="loading-overlay">
-      <view class="loading-content">
-        <view class="loading-spinner"></view>
-        <text class="loading-text">加载中...</text>
-      </view>
-    </view> -->
     
     <form @submit="commitForm">
       <view class="module-com input-line-wrap">
@@ -48,14 +41,14 @@
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title required">名称</view>
-          <input v-model="form.name" placeholder-class="phcolor" class="tui-input" name="name" placeholder="请输入商品名称" maxlength="50" type="text" @focus="clearNameInput" />
+          <input v-model="form.name" placeholder-class="phcolor" class="tui-input" name="name" placeholder="请输入商品名称" maxlength="50" type="text" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">存放位置</view>
+          <view class="tui-title">价格类型</view>
           <view class="btn-group">
-            <button class="admin-button-com middle" :class="[form.priceType === '0' ? '' : 'default']" @click="setPriceType('0')">相册</button>
-            <button class="admin-button-com middle" :class="[form.priceType === '1' ? '' : 'default']" @click="setPriceType('1')">商城</button>
+            <button class="admin-button-com middle" :class="[form.priceType === '0' ? '' : 'default']" @click="setPriceType('0')">无价</button>
+            <button class="admin-button-com middle" :class="[form.priceType === '1' ? '' : 'default']" @click="setPriceType('1')">有价</button>
           </view>
         </tui-list-cell>
 
@@ -78,12 +71,12 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title required">用花支数</view>
+          <view class="tui-title">用花支数</view>
           <input v-model="form.flowerNum" placeholder-class="phcolor" @focus="onFlowerNumFocus" @blur="onFlowerNumBlur" class="tui-input" name="flowerNum" placeholder="用于判断花束大小" maxlength="5" type="number" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title required">重量</view>
+          <view class="tui-title">重量</view>
           <input v-model="form.weight" placeholder-class="phcolor" @focus="onWeightFocus" @blur="onWeightBlur" class="tui-input" name="weight" placeholder="公斤，可输入小数" maxlength="10" type="digit" />
         </tui-list-cell>
 
@@ -127,8 +120,8 @@
       </view>
 
       <view class="app-footer">
-        <button class="admin-button-com middle default" @click="goBack" :disabled="loading">取消</button>
-        <button class="admin-button-com middle blue" formType="submit" :disabled="loading">{{ loading ? '保存中...' : '保存' }}</button>
+        <button class="admin-button-com middle default" @click="goBack">取消</button>
+        <button class="admin-button-com middle blue" formType="submit" >保存</button>
       </view>
 
     </form>
@@ -142,18 +135,16 @@ import { getClass } from "@/api/category";
 import { addGoodsData } from "@/api/goods"
 import { delImage } from "@/api/pic-text";
 import htzImageUpload from '@/components/htz-image-upload/htz-image-upload.vue'
-//import productMins from "@/mixins/product"; //复制页面代码时，没去掉
 import inputRestore from "@/mixins/inputRestore";
 export default {
   name: "add",
   components: { TuiListCell, AppUploader,htzImageUpload },
-	mixins: [inputRestore], //productMins, 
+	mixins: [inputRestore], 
   data() {
     return {
       headers:{token:''},
       status: 1,
 			selectJobType: "addGoodsSelectItem",
-      loading: false, // 新增加载状态
       form: {
         name: "",
         price: "",
@@ -161,8 +152,8 @@ export default {
         stock: 0,
         stockSet: '0', // 默认库存充足
         priceType: '0', // 默认没价格
-        flowerNum: "",
-        weight: "",
+        flowerNum: 0,
+        weight: 1,
         catIds: [],
         autoRise: "1",
         needSend: "0",
@@ -270,16 +261,10 @@ export default {
       }
     },
     init() {
-      this.loading = true;
       getClass().then(res => {
         if(res.code && res.code == 1){
           this.categoryData = res.data
         }
-      }).catch(err => {
-        console.error('获取分类失败:', err);
-        this.$msg('获取分类信息失败');
-      }).finally(() => {
-        this.loading = false;
       })
     },
     // 封面选择
@@ -302,10 +287,6 @@ export default {
         this.form.catIds.splice(index, 1);
       }
     },
-    // 名称输入框聚焦时清空
-    clearNameInput() {
-      this.form.name = "";
-    },
     // 设置价格类型
     setPriceType(type) {
       this.form.priceType = type;
@@ -362,7 +343,6 @@ export default {
       }
       
       that.$util.confirmModal({content:'确认添加？'},() => {
-        this.loading = true; // 开始加载
         uni.showLoading({mask:true})
         let formData = JSON.parse(JSON.stringify(this.form));
         
@@ -382,55 +362,18 @@ export default {
         if(formData.stockSet === '0'){
           formData.stock = 9999;
         }
-        
         addGoodsData({ status: this.status, ...formData }).then(res => {
           uni.hideLoading()
-          // this.removeFromSaveDirect()
-          
-          // 把新增的商品添加到商品列表页的商品数组的第一项
-          if (res.code === 1 && res.data) {
-            try {
-              let pages = getCurrentPages();
-              let prevPage = pages[pages.length - 2];
-              if (prevPage && prevPage.$vm && prevPage.$vm.list && prevPage.$vm.list.data) {
-                // 构造新商品数据，确保包含显示需要的字段
-                const newGoodsItem = {
-                  id: res.data.id || res.data.goodsId,
-                  name: formData.name,
-                  price: formData.priceType === '1' ? parseFloat(formData.price || 0) : 0,
-                  priceType: parseInt(formData.priceType),
-                  stock: formData.stockSet === '1' ? parseInt(formData.stock || 0) : 9999,
-                  actualSold: 0,
-                  smallCover: this.currentImgData.length > 0 ? this.currentImgData[this.form.shopImg.findIndex(img => img === this.form.shortCover)] || this.currentImgData[0] : '',
-                  ...res.data
-                };
-                // 将新商品添加到列表第一项
-                prevPage.$vm.list.data.unshift(newGoodsItem);
-                prevPage.$vm.list.total = (prevPage.$vm.list.total || 0) + 1;
-              }
-              this.$msg("添加成功")
-            } catch (error) {
-              console.log('更新列表页数据失败:', error);
-            }
+          if (res.code === 1) {
+              let id = res.data.id?res.data.id:0
+              let name = res.data.name?res.data.name:''
+              that.pageTo({url:'/admin/goods/result?id='+id+'&name='+name,type:2})
           }
-          
-          setTimeout(function(){
-            uni.navigateBack({})
-          },1500)
-        }).catch(err => {
-          uni.hideLoading()
-          this.$msg(err.msg || '添加失败')
-        }).finally(() => {
-          this.loading = false; // 结束加载
         })
       })
     },
     commitForm(e) {
-      // 防止重复提交
-      if (this.loading) {
-        return;
-      }
-      
+   
       let rules = [
         {
           name: "name",
@@ -493,9 +436,7 @@ export default {
       let formData = e.detail.value;
       let checkRes = form.validation(formData, rules);
       if (!checkRes) {
-        setTimeout(() => {
-          this.confirmFn();
-        });
+         this.confirmFn();
       } else {
         this.$msg(checkRes);
       }
@@ -533,44 +474,6 @@ export default {
   padding-bottom: 100upx;
 }
 
-/* 加载状态样式 */
-.loading-overlay {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: rgba(0, 0, 0, 0.5);
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  z-index: 999999;
-}
-
-.loading-content {
-  background-color: #fff;
-  border-radius: 20upx;
-  padding: 40upx;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
-
-.loading-spinner {
-  width: 60upx;
-  height: 60upx;
-  border: 4upx solid #f3f3f3;
-  border-top: 4upx solid #09C567;
-  border-radius: 50%;
-  animation: spin 1s linear infinite;
-  margin-bottom: 20upx;
-}
-
-.loading-text {
-  font-size: 28upx;
-  color: #666;
-}
-
 @keyframes spin {
   0% { transform: rotate(0deg); }
   100% { transform: rotate(360deg); }

hdApp/src/admin/goods/categorySort.vue

@@ -11,11 +11,12 @@
               transition: isDragging ? 'none' : 'transform 0.3s ease',
               zIndex: draggedIndex === index ? 999 : 1
             }"
+            @click="navigateToGoodsSort(item.id)"
           >
-            <view class="list-img" @click="navigateToGoodsSort(item.id)">
+            <view class="list-img">
               <image :src="item.img" mode="aspectFit"></image>
             </view>
-            <view class="list-det" @click="navigateToGoodsSort(item.id)">
+            <view class="list-det">
               <view class="app-size-28 app-color-0" style="font-size: 30rpx; font-weight: bold">{{ item.categoryName }}</view>
             </view>
 
@@ -29,6 +30,7 @@
 						<text style="right:125rpx;" class="move-btn" @click.stop="downFn(item.id)">↓</text>
 						-->
 
+            <!-- 这个页面不显示，影响用户使用，这个做到分类页去
             <view
               style="position: absolute; top: 50rpx; right: 188rpx; cursor: move"
               class="drag-handle"
@@ -40,8 +42,10 @@
             >
               <text style="color: #333333; font-size: 45rpx">≡</text>
             </view>
+            -->
+
             <view class="confirm-btn">
-              <button class="admin-button-com middle blue" style="position:absolute;top:50rpx;right: 10rpx" @click="navigateToGoodsSort(item.id)">去排序</button>
+              <button class="admin-button-com middle blue" style="position:absolute;top:50rpx;right: 10rpx">去排序</button>
             </view>
           </view>
         </block>

hdApp/src/admin/goods/detail.vue

@@ -56,10 +56,10 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">存放位置</view>
+          <view class="tui-title">价格类型</view>
           <view class="btn-group">
-            <button class="admin-button-com middle" :class="[form.priceType === '0' ? '' : 'default']" @click="setPriceType('0')">相册</button>
-            <button class="admin-button-com middle" :class="[form.priceType === '1' ? '' : 'default']" @click="setPriceType('1')">商城</button>
+            <button class="admin-button-com middle" :class="[form.priceType === '0' ? '' : 'default']" @click="setPriceType('0')">无价</button>
+            <button class="admin-button-com middle" :class="[form.priceType === '1' ? '' : 'default']" @click="setPriceType('1')">有价</button>
           </view>
         </tui-list-cell>
 
@@ -88,12 +88,12 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title required">用花支数</view>
+          <view class="tui-title">用花支数</view>
           <input v-model="form.flowerNum" @focus="onFlowerNumFocus" @blur="onFlowerNumBlur" placeholder-class="phcolor" class="tui-input" name="flowerNum" placeholder="用于判断花束大小" maxlength="5" type="number" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title required">重量</view>
+          <view class="tui-title">重量</view>
           <input v-model="form.weight" @focus="onWeightFocus" @blur="onWeightBlur" placeholder-class="phcolor" class="tui-input" name="weight" placeholder="公斤，可输入小数" maxlength="10" type="digit" />
         </tui-list-cell>
 

hdApp/src/admin/goods/goodsSort.vue

@@ -1,31 +1,6 @@
 <template>
   <view class="app-content">
-    <!-- 价格类型切换：相册 / 商城 -->
-    <view class="modern-tabs-container">
-      <view class="modern-tabs">
-        <view
-          class="modern-tab"
-          :class="{ 'active': priceType === 0 }"
-          @click="switchPriceTab(0)"
-        >
-          <view class="tab-content">
-            <text class="tab-icon">🏷️</text>
-            <text class="tab-text">相册</text>
-          </view>
-        </view>
-        <view
-          class="modern-tab"
-          :class="{ 'active': priceType === 1 }"
-          @click="switchPriceTab(1)"
-        >
-          <view class="tab-content">
-            <text class="tab-icon">💰</text>
-            <text class="tab-text">商城</text>
-          </view>
-        </view>
-      </view>
-    </view>
-    
+   
     <view class="list-wrap">
       <block v-if="!$util.isEmpty(list.data)">
         <block v-for="(item, index) in list.data" :key="item.id">
@@ -53,6 +28,7 @@
 
             <view class="list-det" style="position: absolute; bottom: 15upx; left: 122upx">
               <view v-if="item.priceType == 1" class="app-size-28 app-color-0" style="font-size: 24upx">¥{{ item.price?parseFloat(item.price):0 }}</view>
+              <view v-else>--</view>
             </view>
             <view
               v-if="index > 0"
@@ -120,7 +96,6 @@ export default {
   mixins: [list],
   data() {
     return {
-      priceType: 0, // 0 相册（无价格），1 商城（有价格）
       draggedIndex: -1,
       draggedItem: null,
       dragOffsetY: 0,
@@ -173,8 +148,7 @@ export default {
       const params = {
         cId: this.option.id,
         page: this.list.page,
-        pageSize: this.list.pageSize,
-        priceType: this.priceType
+        pageSize: this.list.pageSize
       };
 
       return getListB(params)
@@ -188,14 +162,6 @@ export default {
           this.list.loading = false;
         });
     },
-    // 切换 相册 / 商城
-    switchPriceTab(value) {
-      if (this.priceType === value) return;
-      this.priceType = value;
-      this.resetList();
-      this._list();
-    },
-
     // 响应 touchmove 事件并实时更新 transform 样式
     transformStyle(index) {
       if (index === this.draggedIndex) {

hdApp/src/admin/goods/list.vue

@@ -3,34 +3,22 @@
 
     <view class="modern-tabs-container">
       <view class="modern-tabs">
-        <view 
-          class="modern-tab" 
-          :class="{ 'active': priceType === 0 }" 
-          @click="switchPriceTab(0)"
-        >
+        <view class="modern-tab" :class="{ 'active': priceType === -1 }" @click="switchPriceTab(-1)" >
           <view class="tab-content">
-            <text class="tab-icon">🏷️</text>
-            <text class="tab-text">相册</text>
+            <text class="tab-icon">📋</text>
+            <text class="tab-text">全部</text>
           </view>
         </view>
-        <view 
-          class="modern-tab" 
-          :class="{ 'active': priceType === 1 }" 
-          @click="switchPriceTab(1)"
-        >
+        <view class="modern-tab" :class="{ 'active': priceType === 0 }" @click="switchPriceTab(0)" >
           <view class="tab-content">
-            <text class="tab-icon">💰</text>
-            <text class="tab-text">商城</text>
+            <text class="tab-icon">🏷️</text>
+            <text class="tab-text">无价</text>
           </view>
         </view>
-        <view 
-          class="modern-tab" 
-          :class="{ 'active': priceType === -1 }" 
-          @click="switchPriceTab(-1)"
-        >
+        <view class="modern-tab" :class="{ 'active': priceType === 1 }" @click="switchPriceTab(1)" >
           <view class="tab-content">
-            <text class="tab-icon">📋</text>
-            <text class="tab-text">全部</text>
+            <text class="tab-icon">💰</text>
+            <text class="tab-text">有价</text>
           </view>
         </view>
       </view>
@@ -185,7 +173,7 @@ export default {
       searchTimer: null, // 搜索防抖定时器
       riseData: {}, // 价格上涨配置
       hasStock:-1, // 0没库存 1有库存
-      priceType:0, // 0 没价格，1 有价格 
+      priceType:-1,// 0 没价，1 有价 
       // 新增筛选相关数据
       showFilterPanel: false,
       // 价格筛选已移至顶部标签页

hdApp/src/admin/goods/result.vue

@@ -0,0 +1,271 @@
+<template>
+	<view class="app-content">
+		<view class="billing_box_bg">
+			<view class="top-view"> </view>
+			<view class="result-view">
+			<view class="iconfont iconchenggong"></view>
+			<view class="result-title">添加成功</view>
+			<button class="admin-button-com middle blue" style="width:20vw;" @click="goBack">返回</button>
+			<view class="form-container">
+				<form>
+					<view class="module-com input-line-wrap">
+
+						<tui-list-cell class="line-cell" :hover="false">
+							<view class="tui-title">名称</view>
+							<view>{{ goodsName }}</view>
+						</tui-list-cell>
+
+						<tui-list-cell class="line-cell" :hover="false">
+							<view class="tui-title">数量</view>
+							<input v-model="form.num" placeholder-class="phcolor" class="tui-input" name="num" @focus="form.num=''" placeholder="填写数量" maxlength="50" type="number" />
+						</tui-list-cell>
+
+						<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
+							<view class="tui-title">单价</view>
+							<input type="digit" @focus="goodsPrice=''" style="width:260upx;" v-model="goodsPrice" placeholder-class="tui-placeholder" placeholder="填写金额" />
+							<text style="color:#3385FF;font-weight:bold;">合计 ¥<text>{{orderTotalPrice}}</text></text>
+						</tui-list-cell>
+
+						<tui-list-cell class="line-cell" :hover="false" :arrow="false">
+							<view class="tui-title">收款方式</view>
+                			<button @click="form.hasPay = 4" class="admin-button-com middle" :class="form.hasPay == 4 ? 'blue' : 'default'">余额</button>
+                			<button @click="form.hasPay = 0" class="admin-button-com middle" :class="form.hasPay == 0 ? 'blue' : 'default'" style="margin-left:6upx;">扫码</button>
+							<button @tap="form.hasPay = 1" class="admin-button-com middle" :class="form.hasPay == 1 ? 'blue' : 'default'" style="margin-left:6upx;">线下</button>
+							<button @tap="form.hasPay = 2" class="admin-button-com middle" :class="form.hasPay == 2 ? 'blue' : 'default'" style="margin-left:6upx;">赊账</button>
+						</tui-list-cell>
+
+						<tui-list-cell class="line-cell" :arrow="true" v-if="form.hasPay == 1">
+							<view class="tui-title">线下渠道</view>
+							<picker mode="selector" :value="form.payWay" :range="payWayList" range-key="name" @change="payWayChange" class="tui-input" >
+								<input v-model="form.payWay" name="payWay" type="text" hidden />
+								<view style="padding:6upx 0 6upx 0;">{{payWayList[payWayindex].name}}</view>
+							</picker>
+						</tui-list-cell>
+
+						<tui-list-cell class="line-cell" :hover="false">
+							<view class="tui-title">配送方式</view>
+							<button @tap="setSendType(0)" class="admin-button-com middle" :class="form.sendType == 0 ? 'blue' : 'default'">送货</button>
+							<button @tap="setSendType(1)" class="admin-button-com middle" :class="form.sendType == 1 ? 'blue' : 'default'" style="margin-left:6upx;">自取</button>
+							<button @click="setSendType(2)" class="admin-button-com middle" :class="form.sendType == 2 ? 'blue' : 'default'" style="margin-left:6upx;">跑腿</button>
+							<button @click="setSendType(3)" class="admin-button-com middle" :class="form.sendType == 3 ? 'blue' : 'default'" style="margin-left:6upx;">物流</button>
+						</tui-list-cell>
+
+						<tui-list-cell class="line-cell" :hover="false" :arrow="true">
+							<view class="tui-title" v-if="form.sendType == 1">取花日期</view>
+							<view class="tui-title" v-else>配送日期</view>
+							<picker mode="date" :value="form.reachDate" @change="selTimeFn" class="tui-input">
+								<view v-if="form.reachDate">{{ form.reachDate }}</view>
+								<view v-else>今天</view>
+							</picker>
+						</tui-list-cell>
+
+						<tui-list-cell class="line-cell" :hover="false" :arrow="false">
+							<view class="tui-title" v-if="form.sendType == 1">取花时间</view>
+							<view class="tui-title" v-else>配送时间</view>
+							<picker mode="multiSelector" :value="form.reachPeriod" :range="timeOptions" @change="bindTimeChange">
+								<view class="uni-input" style="width:450upx;">{{form.reachPeriod}}<text style="margin-left:10upx;">前</text></view>
+							</picker>
+						</tui-list-cell>
+
+						<tui-list-cell class="line-cell" :hover="false">
+							<view class="tui-title">备注内容</view>
+							<input v-model="form.remark" placeholder-class="phcolor" class="tui-input" placeholder-style="color:#ccc" name="remark" placeholder="选填" />
+						</tui-list-cell>
+
+						<tui-list-cell class="line-cell" :hover="false">
+							<view class="tui-title">客户</view>
+							<view>快捷开单</view>
+						</tui-list-cell>
+
+						<tui-list-cell class="line-cell" :hover="false">
+							<view class="tui-title">制作</view>
+							<button @tap="form.needWork = 1" class="admin-button-com middle" :class="form.needWork == 1 ? 'blue' : 'default'">需要</button>
+							<button @tap="form.needWork = 0" class="admin-button-com middle" :class="form.needWork == 0 ? 'blue' : 'default'" style="margin-left:30upx;">不要</button>
+						</tui-list-cell>
+
+					</view>
+				</form>
+				<view class="button-group">
+					<button class="admin-button-com big default" @click="goBack" style="width:200upx;">取消</button>
+					<button class="admin-button-com big blue" @click="confirmOrder" style="width:200upx;margin-left:50upx;">确认</button>
+				</view>
+			</view>
+		</view>
+		</view>
+	</view>
+</template>
+<script>
+import TuiListCell from "@/components/plugin/list-cell";
+import { createOrder } from "@/api/order";
+import { mapGetters } from "vuex";
+
+export default {
+	name: "result",
+	components: {
+		TuiListCell
+	},
+	data() {
+		return {
+			form: {
+				hasPay: 4,
+				payWay: 0,
+				num: 1,
+				sendType: 0,
+				reachDate: '',
+				reachPeriod: "12:00",
+				remark: '',
+				needWork:1
+			},
+			goodsPrice: '',
+			payWayindex: 0,
+			payWayList: [
+				{name: "线下微信", id: 0},
+				{name: "线下支付宝", id: 1},
+				{name: "现金", id: 4},
+				{name: "银行卡", id: 5}
+			],
+			timeOptions: [
+				['00', '01', '02','03','04','05','06','07','08','09','10','11','12','13', '14','15','16','17','18','19','20','21','22','23'],
+				['00', '05', '10','15','20','25','30','35','40','45','50','55']
+			],
+			goodsName:'',
+			goodsId:0
+		};
+	},
+	computed: {
+		...mapGetters(["getLoginInfo", "getMyShopInfo"]),
+		orderTotalPrice() {
+			let price = 0;
+			if (Number(this.goodsPrice) > 0 && Number(this.form.num) > 0) {
+				price = Number(this.goodsPrice) * Number(this.form.num);
+				price = parseFloat(price.toFixed(2));
+			}
+			return price;
+		}
+	},
+	onLoad(options) {
+		this.goodsName = options.name?options.name:''
+		this.goodsId = options.id?options.id:0
+	},
+	methods: {
+		init() {
+
+		},
+		setSendType (type) {
+			this.form.sendType = type
+		},
+		goBack() {
+			uni.navigateBack({})
+		},
+		confirmOrder() {
+			let product = [{productId:this.goodsId,bigNum:this.form.num,smallNum:null,property:0,num:this.form.num,unitType:0,unitPrice:this.goodsPrice}]
+			let json = JSON.stringify(product)
+			let customId = this.getMyShopInfo && Number(this.getMyShopInfo.defaultCustomId)>0 ? this.getMyShopInfo.defaultCustomId : 0
+			if(Number(customId)<=0){
+				this.$msg('请设置快捷开单的客户')
+				return false
+			}
+      		let params = {...this.form,modifyPrice: this.orderTotalPrice,version:3,orderType:1,product:json,customId:customId};
+
+			this.$util.confirmModal({content:'确认提交'},() => {        
+				uni.showLoading({mask:true})
+				createOrder(params).then((res) => {
+					uni.hideLoading()
+					if(res.code == 1){
+						const {data: { id, orderSn,actPrice }} = res;
+						if(this.form.hasPay == 0){
+							this.$util.pageTo({ url: '/admin/billing/toPay',type:2,query: {orderId:id,orderSn:orderSn,actPrice:actPrice}})
+						}else{
+							this.$util.pageTo({ url: '/admin/billing/result?orderId='+id,type:2})					
+						}
+					}
+				})
+			})
+		},
+		payWayChange(e) {
+			let index = e.detail.value;
+			this.payWayindex = index;
+			this.form.payWay = this.payWayList[index].id;
+		},
+		selTimeFn(e) {
+			this.form.reachDate = e.detail.value;
+		},
+		bindTimeChange(event) {
+			let val = event.detail.value;
+			let before = Number(val[0]);
+			let after = Number(val[1]);
+			let timeOptions = this.timeOptions;
+			this.form.reachPeriod = timeOptions[0][before]+':'+timeOptions[1][after];
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.billing_box_bg {
+	position: relative;
+	padding: 30upx 30upx;
+	display: flex;
+	background: white;
+	flex-direction: column;
+	background-color: #f5f5f5;
+	.top-view {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 299upx;
+		background: #3385ff;
+		border-radius: 0upx 0upx 83upx 83upx;
+	}
+	.result-view {
+		position: relative;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding:25upx 0 30upx;
+		width: 100%;
+		background: #ffffff;
+		border-radius: 20upx;
+		z-index: 1;
+		.iconchenggong {
+			font-size: 100upx;
+			color: $mainColor1;
+		}
+		.result-title {
+			margin: 10upx 0 10upx;
+			font-size: 32upx;
+		}
+		.form-container {
+			width: 100%;
+			.line-cell {
+				.tui-title {
+					width: 210upx;
+					color: $fontColor2;
+					&.required::before {
+						content: '*';
+						color: #ff0000;
+						margin-right: 4upx;
+					}
+				}
+				.tui-input {
+					width: calc(100% - 210upx);
+					font-size: 28upx;
+				}
+				.tui-placeholder {
+					color: #ccc;
+				}
+				.phcolor {
+					color: #ccc;
+				}
+			}
+		}
+		.button-group {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			margin-top: 40upx;
+			padding: 0 30upx;
+		}
+	}
+}
+</style>

hdApp/src/admin/home/apply.vue

@@ -36,10 +36,11 @@ export default {
                 { name: "分类", img: `${this.$constant.hostUrl}/image/ghs/home/hcgl2.png`, url: "/admin/goods/category",pf:1},
                 { name: "排序", img: `${this.$constant.hostUrl}/image/ghs/home/hcgl2.png`, url: "/admin/goods/categorySort",pf:1},
                 { name: "涨价设置", img: `${this.$constant.hostUrl}/image/ghs/home/gj2.png`, url: "/admin/goods/price-increase",pf:1},
+                { name: "新建任务", img: `${this.$constant.hostUrl}/image/ghs/home/hcgl2.png`, url: "/admin/order/workOrder",pf:1},
             ]
         },
         {
-            title:'花材绿植',
+            title:'绿植花材',
             list:[
                 {name: "列表",img: `${this.$constant.hostUrl}/image/ghs/home/hcgl2.png`,url: "/admin/item/list2",pf:1},
                 {name: "分类",img: `${this.$constant.hostUrl}/image/ghs/home/hcgl2.png`,url: "/admin/itemClass/list",pf:1},

hdApp/src/admin/home/workbench.vue

@@ -116,11 +116,11 @@
               </view>
               <view class="icon-text">商城</view>
             </view>
-            <view class="icon-item" @click="goPage({url: '/admin/cg/album'})">
+            <view class="icon-item" @click="goPage({url: '/admin/work/list'})">
               <view class="icon-wrapper">
                 <image class="icon-image" :src="`${constant.hostUrl}/image/ghs/home/shop2.png`" mode="aspectFit"></image>
               </view>
-              <view class="icon-text">相册</view>
+              <view class="icon-text">任务</view>
             </view>
             <view class="icon-item" @click="goHsKd">
               <view class="icon-wrapper">
@@ -134,17 +134,17 @@
               </view>
               <view class="icon-text">快捷开单</view>
             </view>
-            <view class="icon-item" @click="goPage({url: '/admin/work/list'})">
+            <view class="icon-item" @click="goPage({url: '/admin/goods/category'})">
               <view class="icon-wrapper">
-                <image class="icon-image" :src="`${constant.hostUrl}/image/ghs/home/shop2.png`" mode="aspectFit"></image>
+                <image class="icon-image" :src="`${constant.hostUrl}/image/ghs/home/hcgl2.png`" mode="aspectFit"></image>
               </view>
-              <view class="icon-text">任务</view>
+              <view class="icon-text">分类</view>
             </view>
-            <view class="icon-item" @click="goPage({url: '/admin/order/workOrder'})">
+            <view class="icon-item" @click="goPage({url: '/admin/goods/categorySort'})">
               <view class="icon-wrapper">
                 <image class="icon-image" :src="`${constant.hostUrl}/image/ghs/home/hcgl2.png`" mode="aspectFit"></image>
               </view>
-              <view class="icon-text">接花束</view>
+              <view class="icon-text">花束排序</view>
             </view>
             <view class="icon-item" @click="goPage({url: '/admin/goods/list'})">
               <view class="icon-wrapper">
@@ -165,7 +165,7 @@
         <view class="flower-section">
           <view class="section-header">
             <view class="header-line"></view>
-            <view class="header-title">花材绿植</view>
+            <view class="header-title">绿植花材</view>
             <view class="header-line"></view>
           </view>
           <view class="icon-grid">
@@ -199,17 +199,17 @@
               </view>
               <view class="icon-text">拆散</view>
             </view>
-            <view class="icon-item" @click="goPage({url: '/admin/breakage/list'})">
+            <view class="icon-item" @click="goPage({url: '/admin/item/list2'})">
               <view class="icon-wrapper">
-                <image class="icon-image" :src="`${constant.hostUrl}/image/ghs/home/kcyjs2.png`" mode="aspectFit"></image>
+                <image class="icon-image" :src="`${constant.hostUrl}/image/ghs/home/hcgl2.png`" mode="aspectFit"></image>
               </view>
-              <view class="icon-text">损耗</view>
+              <view class="icon-text">绿植花材</view>
             </view>
-            <view class="icon-item" @click="goPage({url: '/admin/item/list2'})">
+            <view class="icon-item" @click="goPage({url: '/pagesPurchase/shopping'})">
               <view class="icon-wrapper">
-                <image class="icon-image" :src="`${constant.hostUrl}/image/ghs/home/hcgl2.png`" mode="aspectFit"></image>
+                <image class="icon-image" :src="`${constant.hostUrl}/image/ghs/home/icon_caigou2.png`" mode="aspectFit"></image>
               </view>
-              <view class="icon-text">花材绿植</view>
+              <view class="icon-text">买花记录</view>
             </view>
             <view class="icon-item" @click="goPage({url: '/pagesPurchase/order'})">
               <view class="icon-wrapper">
@@ -217,11 +217,11 @@
               </view>
               <view class="icon-text">买花</view>
             </view>
-            <view class="icon-item" @click="goPage({url: '/pagesPurchase/shopping'})">
+            <view class="icon-item" @click="goPage({url: '/admin/breakage/list'})">
               <view class="icon-wrapper">
-                <image class="icon-image" :src="`${constant.hostUrl}/image/ghs/home/icon_caigou2.png`" mode="aspectFit"></image>
+                <image class="icon-image" :src="`${constant.hostUrl}/image/ghs/home/kcyjs2.png`" mode="aspectFit"></image>
               </view>
-              <view class="icon-text">买花记录</view>
+              <view class="icon-text">损耗</view>
             </view>
             <view class="icon-item" @click="goPage({url: '/admin/itemClass/list'})">
               <view class="icon-wrapper">
@@ -263,6 +263,12 @@
               </view>
               <view class="icon-text">图文</view>
             </view>
+            <view class="icon-item" @click="goPage({url: '/admin/cg/code'})">
+              <view class="icon-wrapper">
+                <image class="icon-image" :src="`${constant.hostUrl}/image/ghs/home/shop2.png`" mode="aspectFit"></image>
+              </view>
+              <view class="icon-text">收款码</view>
+            </view>
             <view class="icon-item" @click="goPage({url: '/admin/order/scanPay'})">
               <view class="icon-wrapper">
                 <image class="icon-image" :src="`${constant.hostUrl}/image/ghs/home/kcyjs2.png`" mode="aspectFit"></image>

hdApp/src/admin/order/components/app-delivery-modify.vue

@@ -6,8 +6,8 @@
       <tui-list-cell class="line-cell" :hover="false">
         <view class="tui-title">配送方式</view>
         <button @tap="form.sendType = 3" class="admin-button-com middle" :class="form.sendType == 3 ? 'blue' : 'default'">骑手送</button>
-        <button @tap="form.sendType = 2" class="admin-button-com middle" style="margin-left:15upx;" :class="form.sendType == 2 ? 'blue' : 'default'">自己送</button>
-        <button @tap="form.sendType = 1" class="admin-button-com middle" style="margin-left:15upx;" :class="form.sendType == 1 ? 'blue' : 'default'">到店自取</button>
+        <button @tap="form.sendType = 2" class="admin-button-com middle" style="margin-left:13upx;" :class="form.sendType == 2 ? 'blue' : 'default'">自配送</button>
+        <button @tap="form.sendType = 1" class="admin-button-com middle" style="margin-left:13upx;" :class="form.sendType == 1 ? 'blue' : 'default'">到店自取</button>
       </tui-list-cell>
 
       <template>
@@ -79,6 +79,11 @@
           </tui-list-cell>
         </template>
 
+        <tui-list-cell class="line-cell" :hover="false">
+          <view class="tui-title">备注内容</view>
+          <input v-model="form.remark" placeholder-class="phcolor" class="tui-input" placeholder-style="color:#ccc" name="remark" placeholder="选填" />
+        </tui-list-cell>
+
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">订花人姓名</view>
           <input v-model="form.bookName" placeholder-class="phcolor" placeholder-style="color:#ccc;" style="width:285upx;" class="tui-input" name="bookName" placeholder="请填写姓名" />
@@ -91,11 +96,6 @@
 
       </template>
 
-      <tui-list-cell class="line-cell" :hover="false">
-        <view class="tui-title">备注</view>
-        <input v-model="form.remark" placeholder-class="phcolor" class="tui-input" placeholder-style="color:#ccc" name="remark" placeholder="选填，不要贺卡这里备注" />
-      </tui-list-cell>
-
     </view>
 
     <!-- 省市联动 -->

hdApp/src/admin/order/workOrder.vue

@@ -18,15 +18,6 @@
 
        <view class="module-com input-line-wrap" style="position:relative;">
 
-        <tui-list-cell class="line-cell" :arrow="true">
-          <view class="tui-title required">品种</view>
-          <picker mode="selector" :value="form.kindId" :range="kindListData" range-key="name" @change="changeKindFn" class="tui-input" >
-            <input v-model="form.kindId" name="kindId" type="text" hidden />
-            <view v-if="form.kindId" style="height:45upx;" >{{ kindSelectedData.name }}</view>
-            <view class="tui-placeholder" style="height:45upx;" v-else>请选择</view>
-          </picker>
-        </tui-list-cell>
-
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title required">数量</view>
           <input v-model="form.num" placeholder-class="phcolor" class="tui-input" name="num" @focus="form.num=''" placeholder="填写数量" maxlength="50" type="number" />
@@ -34,7 +25,7 @@
 
         <tui-list-cell class="line-cell" :hover="false" :arrow="false" >
           <view class="tui-title required">单价</view>
-          <input type="digit" @focus="goodsPrice=''" :focus="true" style="width:260upx;" v-model="goodsPrice" placeholder-class="tui-placeholder" placeholder="填写金额" />
+          <input type="digit" @focus="goodsPrice=''" style="width:260upx;" v-model="goodsPrice" placeholder-class="tui-placeholder" placeholder="填写金额" />
           <text style="color:#3385FF;font-weight:bold;">合计 ¥<text>{{orderTotalPrice}}</text></text>
         </tui-list-cell>
 
@@ -101,7 +92,6 @@ export default {
         hasPay:1,
         payWay:0,
         sendCost:'',
-        kindId:'',
         cover:[],
         num:1,
         flowerNum:''
@@ -110,7 +100,6 @@ export default {
 		payWayindex:0,
 		payWayList:[{name:"线下微信",id:0},{name:"线下支付宝",id:1},{name:"现金",id:4},{name:"银行卡",id:5}],
       kindListData:[],
-      kindSelectedData:{},
       currentImgData:[],
       numSelectedData:{num:0,name:0},
       flowerNumList:[{num:9,name:9},{num:11,name:11},{num:16,name:16},{num:33,name:33},{num:52,name:52},{num:66,name:66},{num:99,name:99}]
@@ -160,24 +149,6 @@ export default {
       }
     },
     init() {
-      this.getKindDataFn()
-    },
-    async getKindDataFn() {
-      await getAllKind({flower:1}).then(res => {
-        if (this.$util.isEmpty(res.data)){
-          return false;
-        }
-        this.kindListData = res.data.list ? res.data.list : []
-        if(this.kindListData && this.kindListData[0] && this.kindListData[0].id){
-          this.form.kindId = this.kindListData[0].id||''
-          let name = this.kindListData[0].name||''
-          this.kindSelectedData = {name}
-        }
-      });
-    },
-    changeKindFn(e) {
-        this.kindSelectedData = this.kindListData[e.detail.value];
-        this.form.kindId = this.kindSelectedData.id;
     },
 		payWayChange(e){
 			let index = e.detail.value
@@ -229,8 +200,7 @@ export default {
       that.form = {...that.form,...that.$refs.appDelivery.form}
       that.$util.confirmModal({content:'确认提交？'},() => {
           uni.showLoading({mask:true})
-          let name = that.kindSelectedData.name ? that.kindSelectedData.name : ''
-          createOrder({...that.form,unitGoodsPrice:this.goodsPrice,modifyPrice:modifyPrice,name:name,kindName:name,customId:customId,needWork:1,version:3}).then((res) => {
+          createOrder({...that.form,unitGoodsPrice:this.goodsPrice,modifyPrice:modifyPrice,name:'花束',kindName:'花束',customId:customId,needWork:1,version:3}).then((res) => {
             uni.hideLoading()
             that.pageTo({url: '/admin/order/workOrderResult',type:2,query:{id:res.data.id}})
           })

hdApp/src/components/app-delivery.vue

@@ -29,6 +29,11 @@
           </tui-list-cell>
       </template>
 
+      <tui-list-cell class="line-cell" :hover="false">
+        <view class="tui-title">备注内容</view>
+        <input v-model="form.remark" placeholder-class="phcolor" class="tui-input" placeholder-style="color:#ccc" name="remark" placeholder="选填" />
+      </tui-list-cell>
+
       <tui-list-cell class="line-cell" :hover="false">
         <view class="tui-title required">订花人姓名</view>
         <input v-model="form.bookName" placeholder-class="phcolor" placeholder-style="color:#ccc;" style="width:282upx;" class="tui-input" name="bookName" placeholder="请填写姓名" />
@@ -87,11 +92,6 @@
         </tui-list-cell>
       </template>
 
-      <tui-list-cell class="line-cell" :hover="false">
-        <view class="tui-title">备注</view>
-        <input v-model="form.remark" placeholder-class="phcolor" class="tui-input" placeholder-style="color:#ccc" name="remark" placeholder="选填" />
-      </tui-list-cell>
-
     </view>
     <!-- 省市联动 -->
     <simple-address ref="simpleAddress" :region="regionTree" :pickerValueDefault="cityPickerValueDefault" @onConfirm="getCityConfirm" ></simple-address>

hdApp/src/pages.json

@@ -85,8 +85,8 @@
 		{
 			"root": "admin/item",
 			"pages": [
-				{"path": "list","style": {"navigationBarTitleText": "花材绿植"}},
-				{"path": "list2","style": {"navigationBarTitleText": "花材绿植"}},
+				{"path": "list","style": {"navigationBarTitleText": "绿植花材"}},
+				{"path": "list2","style": {"navigationBarTitleText": "绿植花材"}},
 				{"path": "copy","style": {"navigationBarTitleText": "复制新建"}},
 				{"path": "detail","style": {"navigationBarTitleText": "花材详情"}},
 				{"path": "add","style": {"navigationBarTitleText": "添加花材"}},
@@ -116,7 +116,7 @@
 			"pages": [
 				{ "path": "mall", "style": { "navigationBarTitleText": "商城" } },
 				{ "path": "album", "style": { "navigationBarTitleText": "相册" } },
-				{ "path": "item", "style": { "navigationBarTitleText": "花材绿植" } },
+				{ "path": "item", "style": { "navigationBarTitleText": "绿植花材" } },
 				{ "path": "code", "style": { "navigationBarTitleText": "收款码" } },
 				{ "path": "member", "style": { "navigationBarTitleText": "注册会员码" } },
 				{ "path": "alipay", "style": { "navigationBarTitleText": "付款" } }
@@ -318,8 +318,9 @@
 				{ "path": "pdGoodsConfirm", "style": { "navigationBarTitleText": "确认盘点" } },
 				{ "path": "pdGoodsDetail", "style": { "navigationBarTitleText": "详情" } },
 				{ "path": "categorySort", "style": { "navigationBarTitleText": "排序" } },
-				{ "path": "goodsSort", "style": { "navigationBarTitleText": "商品排序" } },
-				{ "path": "picTextAdd-Edit", "style": { "navigationBarTitleText": "创建简介" } }
+				{ "path": "goodsSort", "style": { "navigationBarTitleText": "排序" } },
+				{ "path": "picTextAdd-Edit", "style": { "navigationBarTitleText": "创建简介" } },
+				{ "path": "result", "style": { "navigationBarTitleText": "添加成功" }}
 			]
 		},
 		{

hdApp/src/pagesPurchase/aliPay.vue

@@ -37,7 +37,7 @@
           <button class="button-com" @click="savePayCode" style="margin-top:10upx;" :class="[remainPayTime >0 ? 'ali-btn green':'default']" :disabled="remainPayTime > 0 ? false : true">保存二维码</button>
           <button class="button-com" @click="goDetail" style="margin-top:30upx;" :class="[remainPayTime >0 ? 'ali-btn green':'default']" :disabled="remainPayTime > 0 ? false : true">我已付款成功</button>
           <view style="margin-top:25upx;font-size:32upx;text-decoration: underline;" @click="teachPayFn()">不会用支付宝付款？点这里教您</view>
-          <button class="button-com pay-wx" @click="useWxPay()" :class="[remainPayTime >0 ? 'green':'default']" style="margin-top:50upx;" :disabled="remainPayTime > 0 ? false : true">用微信付款</button>
+          <button class="button-com pay-wx" @click="useWxPay()" :class="[remainPayTime >0 ? 'green':'default']" style="margin-top:50upx;" :disabled="remainPayTime > 0 ? false : true">微信付款</button>
         </div>
         <!-- #endif -->
         <!-- #ifdef APP-PLUS -->

hdApp/src/pagesPurchase/wechatPay.vue

@@ -36,9 +36,9 @@
           <view v-else>
             <button class="button-com pay-wx" :class="[remainPayTime >0 ? 'green':'default']" style="height:100upx;line-height:50upx;" :disabled="remainPayTime >0 ? false : true" @click="wxPayFn">微信支付</button>
           </view>
-          <button class="button-com pay-wx" :class="[remainPayTime >0 ? 'green':'default']" style="margin-top:60upx;" :disabled="remainPayTime >0 ? false : true" @click="debtPay" v-if="hasDebtPay === '1'">赊账</button>
+          <button class="button-com pay-wx" :class="[remainPayTime >0 ? 'green':'default']" style="height:100upx;line-height:100upx;margin-top:60upx;padding:0;display:flex;align-items:center;justify-content:center;width:70%;margin-left:auto;margin-right:auto;" :disabled="remainPayTime >0 ? false : true" @click="debtPay" v-if="hasDebtPay === '1'">赊账</button>
 
-          <button class="button-com" @click="useAliPay()" :class="[remainPayTime >0 ? 'ali-btn green':'default']" style="margin-top:65upx;" :disabled="remainPayTime > 0 ? false : true">用支付宝付款</button>
+          <button class="button-com" @click="useAliPay()" :class="[remainPayTime >0 ? 'ali-btn green':'default']" style="height:100upx;line-height:100upx;margin-top:65upx;padding:0;display:flex;align-items:center;justify-content:center;width:70%;margin-left:auto;margin-right:auto;" :disabled="remainPayTime > 0 ? false : true">支付宝付款</button>
 
         </div>
         <!-- #endif -->

mallApp/src/pages.json

@@ -1,12 +1,12 @@
 {
     "pages": [{ "path": "pages/home/recent", "style": { "navigationBarTitleText": "我的花店","enablePullDownRefresh":true} },
         { "path": "pages/home/index", "style": { "navigationBarTitleText": "首页" } },
-        { "path": "pages/home/category", "style": { "navigationBarTitleText": "花束商城" } },
-        { "path": "pages/home/mall", "style": { "navigationBarTitleText": "花束相册" } },
+        { "path": "pages/home/category", "style": { "navigationBarTitleText": "花束花篮" } },
+        { "path": "pages/home/mall", "style": { "navigationBarTitleText": "相册" } },
         { "path": "pages/home/shop", "style": { "navigationBarTitleText": "门店" } },
         { "path": "pages/home/user", "style": { "navigationBarTitleText": "我的" } },
         { "path": "pages/home/course", "style": { "navigationBarTitleText": "课程"}},
-        { "path": "pages/item/item", "style": { "navigationBarTitleText": "花材绿植"} },
+        { "path": "pages/item/item", "style": { "navigationBarTitleText": "绿植花材"} },
         { "path": "pages/item/detail", "style": { "navigationBarTitleText": "详情"} },
         { "path": "common/redirect", "style": { "navigationBarTitleText": "加载中..." } },
         { "path": "common/webview", "style": { "navigationBarBackgroundColor": "#ffffff", "navigationBarTextStyle": "black" } },

mallApp/src/pages/home/category.vue

@@ -18,12 +18,7 @@
 			<view class="buy-flower-container">
 				<button class="buy-material-btn" @click="buyProduct()">
 					<view class="btn-content">
-						<text class="btn-text">🌸 花材绿植</text>
-					</view>
-				</button>
-				<button class="buy-flower-btn" @click="buyAlbum()">
-					<view class="btn-content">
-						<text class="btn-text">📷 花束相册</text>
+						<text class="btn-text">🌸 绿植花材</text>
 					</view>
 				</button>
 			</view>
@@ -39,17 +34,18 @@
     <!-- 搜索结果展示区域 -->
     <scroll-view v-if="isSearchMode" scroll-y class="right-box" @scrolltolower="reachBottom">
       <view class="page-view" v-if="!$util.isEmpty(list.data)" >
-        <view class="goods-list" v-for="(items) in list.data" :key="items.id" @click="toBuy(items)" >
+        <view class="goods-list" v-for="(itemData) in list.data" :key="itemData.id" @click="toBuy(itemData)" >
           <view class="img-blo">
-            <image :src="items.smallCover" mode="aspectFill" ></image>
+            <image :src="itemData.smallCover" mode="aspectFill" ></image>
           </view>
           <view class="goods-det">
             <view class="goods-det-top">
-              <view class="goods-name">{{ items.name }}</view>
-              <view class="goods-sales">已售 {{ items.totalSold }}</view>
+              <view class="goods-name">{{ itemData.name }}</view>
+              <view class="goods-sales">已售 {{ itemData.totalSold }}</view>
             </view>
-            <view class="goods-price">￥{{ items.price?parseFloat(items.price):0 }}</view>
-            <view class="buy-btn">购买</view>
+            <view class="goods-price" v-if="Number(itemData.priceType) == 1">￥{{ itemData.price?parseFloat(itemData.price):0 }}</view>
+            <view class="goods-price" v-else>--</view>
+            <view class="buy-btn">购买{{ itemData.priceType }}</view>
           </view>
         </view>
       </view>
@@ -65,16 +61,17 @@
     <block v-for="(item,index) in tabbar" :key="index" >
       <scroll-view scroll-y class="right-box" @scrolltolower="reachBottom" v-if="!isSearchMode && currentTab==index" >
         <view class="page-view" v-if="!$util.isEmpty(list.data)" >
-          <view class="goods-list" v-for="(items) in list.data" :key="items.id" @click="toBuy(items)" >
+          <view class="goods-list" v-for="(itemData) in list.data" :key="itemData.id" @click="toBuy(itemData)" >
             <view class="img-blo">
-              <image :src="items.smallCover" mode="aspectFill" ></image>
+              <image :src="itemData.smallCover" mode="aspectFill" ></image>
             </view>
             <view class="goods-det">
               <view class="goods-det-top">
-                <view class="goods-name">{{ items.name }}</view>
-                <view class="goods-sales">已售 {{ items.totalSold }}</view>
+                <view class="goods-name">{{ itemData.name }}</view>
+                <view class="goods-sales">已售 {{ itemData.totalSold }}</view>
               </view>
-              <view class="goods-price">￥{{ items.price?parseFloat(items.price):0 }}</view>
+              <view class="goods-price" v-if="Number(itemData.priceType) == 1">￥{{ itemData.price?parseFloat(itemData.price):0 }}</view>
+              <view class="goods-price" v-else>--</view>
               <view class="buy-btn">购买</view>
             </view>
           </view>
@@ -134,7 +131,7 @@ export default {
 	},
   onShareAppMessage(res) {
 		return {
-			title: '花束商城',
+			title: '商城',
 			desc: "",
 			path: "pages/home/category?account="+this.option.account,
 		}

mallApp/src/pages/home/mall.vue

@@ -24,7 +24,7 @@
         <button class="buy-material-btn" @click="buyProduct()">
           <view class="btn-content">
             <text class="material-icon">🌸</text>
-            <text class="btn-text">花材绿植</text>
+            <text class="btn-text">绿植花材</text>
           </view>
         </button>
         <button class="buy-flower-btn" @click="buyHs()">
@@ -194,7 +194,7 @@ export default {
       console.log("---------- params: ", params);
       let account = this.option.account ? this.option.account : 0;
       this.$util.pageTo({
-        url: "/pages/goods/detail", //?id="+item.id+'&hdId='+this.hdId+'&categoryId='+this.categoryId+'&account='+account // 与 query 不能同时存在
+        url: "/pages/goods/detail",
         query: {
           id: item.id, // 商品id
           categoryId: item.categoryId,

mallApp/src/pages/home/recent.vue

@@ -156,13 +156,10 @@
             <!-- 操作按钮组 -->
             <view class="action-buttons">
               <view class="action-btn primary" @click.stop="bug(item)">
-                <text class="btn-text">🌸 花材绿植</text>
-              </view>
-              <view class="action-btn tertiary" @click.stop="tj(item)">
-                <text class="btn-text">📷 花束相册</text>
+                <text class="btn-text">🌸 绿植花材</text>
               </view>
               <view class="action-btn secondary" @click.stop="hs(item)">
-                <text class="btn-text">💐 花束商城</text>
+                <text class="btn-text">💐 花束花篮</text>
               </view>
             </view>
 

mallApp/src/pages/item/item.vue

@@ -15,11 +15,6 @@
 				<app-search-module v-model="py" placeholder="这里搜索" @input="searchFn" />
 			</view>
 			<view class="buy-flower-container">
-				<button class="buy-album-btn" @click="buyAlbum()">
-					<view class="btn-content">
-						<text class="btn-text">📷 花束相册</text>
-					</view>
-				</button>
 				<button class="buy-mall-btn" @click="buyHs()">
 					<view class="btn-content">
 						<text class="btn-text">💐 花束商城</text>
@@ -224,7 +219,7 @@ export default {
 	},
   	onShareAppMessage(res) {
 		return {
-			title: '花材绿植',
+			title: '绿植花材',
 			desc: "",
 			path: "pages/item/item?account="+this.option.account,
 		}