更新

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

@@ -0,0 +1,303 @@
+<template>
+<view class="product">
+	<view class="item-cmd_bx" >
+
+		<button v-if="Number(info.limitBuy) > 0" @click.stop="cancelLimitBuyFn(info)" class="admin-button-com mini-btn blue cancel-limit-buy-btn">取消限购</button>
+
+		<button v-if="Number(info.discountPrice)>0" @click.stop="cancelDiscountFn(info)" class="admin-button-com mini-btn blue" 
+			style="position:absolute;bottom:0upx;font-size:24upx;left:10upx;z-index:20;">取消特价</button>
+
+		<button v-if="info.reachNum && info.reachNum>0 && info.reachNumDiscount && info.reachNumDiscount>0" @click.stop="cancelFullOff(info)" class="admin-button-com mini-btn blue" 
+			style="position:absolute;bottom:0upx;font-size:24upx;left:10upx;z-index:30;">取消满减</button>
+
+		<block v-if="Number(info.discountPrice)<=0 && !(info.reachNum && info.reachNum>0 && info.reachNumDiscount && info.reachNumDiscount>0)">
+		<button v-if="info.presell == 1" @click.stop="cancelPreSellFn(info)" class="admin-button-com mini-btn blue" 
+			style="position:absolute;bottom:0upx;font-size:24upx;left:10upx;z-index:30;background-color: #4CAF50;border-color: #4CAF50;">取消预售</button>
+		</block>
+
+        <image :src="`${constant.imgUrl}/icon/official8.png`" v-if="info.auth && info.auth == 1" mode="widthFix" class="official"></image>
+
+		<view class="img_bx" @click="pageTo({url: '/admin/item/detail?id='+info.id})">
+			<block v-if="frontHide == 1">
+				<view class="sold-out">
+					<view class="hide">隐</view>
+				</view>
+			</block>
+			<block v-else>
+				<view v-if="info.status == 2" class="sold-out">
+					<view class="sold-out-xj">已下架</view>
+				</view>
+			</block>
+			<image :src="info.cover" style="width:160upx;height:160upx;" lazy-load="true" :lazy-load-margin="0"></image>
+		</view>
+		<view class="cmd-info_bx active" @click="pageTo({url: '/admin/item/detail?id='+info.id})">
+			<view class="tit">
+				<text style="font-size:22upx;border:1upx solid #3385ff;color:white;background-color:#3385ff;margin-right:5upx;padding-left:5upx;padding-right:5upx;" 
+				v-if="frontHide== 1">隐</text>
+
+				<text style="font-size:22upx;border:1upx solid #4CAF50;color:white;background-color:#4CAF50;margin-right:5upx;padding-left:5upx;padding-right:5upx;" 
+				v-if="info.presell == 1">预售</text>
+
+				<text style="font-size:22upx;border:1upx solid red;color:white;background-color:red;margin-right:5upx;padding-left:5upx;padding-right:5upx;" 
+				v-if="info.limitBuy > 0">限购{{ info.limitBuy }}份</text>
+
+				{{ info.name }}
+
+				<block v-if="info.kind == 2">
+					<text class="show-tree"></text>
+				</block>
+				<block v-else-if="info.kind ==3">
+					<text class="show-hole"></text>
+				</block>
+				<block v-else>
+					<text v-if="info.variety && info.variety ==1" class="show-color"></text>
+				</block>
+			</view>
+			<view class="kc">
+				<text style="color:green;font-weight:normal;">￥{{ info.hjPrice?parseFloat(info.hjPrice):0 }}</text>
+				<text style="margin-left:11upx;color:red;font-weight:bold;font-size:28upx;">￥{{ info.price?parseFloat(info.price):0 }}</text>
+				<text style="margin-left:11upx;color:#333333;font-weight:normal;">￥{{ info.skPrice?parseFloat(info.skPrice):0 }}</text>
+				<text style="margin-left:14upx;color:#3385FF;font-weight:bold;" v-if="info.reachNum && info.reachNum>0 && info.reachNumDiscount && info.reachNumDiscount>0">{{info.reachNum}}↓{{info.reachNumDiscount?parseFloat(info.reachNumDiscount):0}}</text>
+			</view>
+			<view class="num-open_bx">
+				<template>
+					<view class="open-bx">
+						剩<text style="font-size:23upx;">{{ info.stock?parseFloat(info.stock):0 }}</text>
+						<text style="margin-left:9upx;font-size:23upx;" v-if="info.onStock>0">路上<text style="font-weight:700;">{{info.onStock}}</text></text>
+						<text style="margin-left:9upx;font-size:23upx;display:inline-block;color:#999;font-weight:normal;">成本{{ info.avCost ? parseFloat(info.avCost) : 0 }}</text>
+						<text style="margin-left:9upx;font-size:23upx;display:inline-block;color:#999;font-weight:normal;">销{{ info.actualSold ? parseInt(info.actualSold) : 0 }}</text>
+						<text style="margin-left:9upx;font-size:23upx;display:inline-block;color:#999;font-weight:normal;">
+							{{info.ratioType == 0 ? info.ratio :'若干'}}支
+						</text>
+					</view>
+				</template>
+			</view>
+		</view>
+	</view>
+
+	<item-remark-bar :text="info.itemRemark" :item-id="info.id" :info="info" @cleared="onItemRemarkCleared" />
+
+	<view class="bottom-buttons-container">
+		<text class="bottom-button" @click.stop="doPrintLabel(info,1)">价码</text>
+		<text class="bottom-button" @click.stop="doPrintLabel(info,0)">标签</text>
+		<text class="bottom-button" @click.stop="hideChangeFn(info)">{{ frontHide == 0 ? '隐藏' : '显示' }}</text>
+		<text class="bottom-button" @click.stop="goToStockDetail(info)">库存明细</text>
+	</view>
+
+</view>
+</template>
+<script>
+import ItemRemarkBar from '@/components/module/itemRemarkBar.vue'
+
+export default {
+	name: "item",
+	components: {
+		ItemRemarkBar
+	},
+	props: {
+		info: {
+			required: true
+		}
+	},
+	data() {
+		return {
+			frontHide:0
+		};
+	},
+	mounted(){
+		if(this.info){
+			this.frontHide = this.info.frontHide
+		}
+	},
+	watch: {
+		info: {
+			deep: true,
+			handler: function(info){
+				this.frontHide = info.frontHide
+			}
+		}
+	},
+	methods: {
+		onItemRemarkCleared(id) {
+			this.$set(this.info, 'itemRemark', '')
+			this.$emit('remarkCleared', id)
+		},
+		hideChangeFn(item){
+			let status = this.frontHide == 0 ? 1 : 0
+			this.$emit("hideChangeFn",item,status)
+		},
+		cancelPreSellFn(item){
+			this.$emit("cancelPreSellFn",item)
+		},
+		cancelDiscountFn(item){
+			this.$emit("cancelDiscountFn",item)
+		},
+		cancelFullOff(item){
+			this.$emit("cancelFullOff",item)
+		},
+		cancelLimitBuyFn(item){
+			this.$emit("cancelLimitBuyFn", item)
+		},
+		doPrintLabel(item,type){
+			this.$emit('doPrintLabel', item.id,type)
+		},
+		goToStockDetail(item){
+			this.$util.pageTo({url: "/pagesStorehouse/stockWarn/detailed?id="+item.id+'&name='+item.name})
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.product{
+	min-height: 230upx;
+}
+.bottom-buttons-container{
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	width: 100%;
+	flex-wrap: nowrap;
+}
+.bottom-button{
+	font-weight:normal;
+	border:2upx solid #cccccc;
+	font-size:22upx;
+	border-radius: 20upx;
+	padding:17upx 16upx;
+	color:#aaa9a9;
+	flex: 1;
+	text-align: center;
+	margin: 0 4upx;
+	white-space: nowrap;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	box-sizing: border-box;
+}
+.item-cmd_bx {
+	height:160upx;
+	position: relative;
+	margin-bottom: 20upx;
+	.cancel-limit-buy-btn{
+		position:absolute;
+		top:0;
+		left:10upx;
+		z-index:40;
+		font-size:24upx;
+		background-color:#ff4d4f;
+		border-color:#ff4d4f;
+	}
+	.official{
+		z-index:50;
+		position:absolute;
+		top:62upx;
+		right:25upx;
+		width:42upx;
+		height:42upx;
+		display:inline-block;
+	}
+	.img_bx {
+		height: 160upx;
+		width: 160upx;
+		position: absolute;
+		left: 0upx;
+		top: 0upx;
+		.sold-out{
+			z-index:10;
+			width:160upx;
+			height:160upx;
+			background-color:black;
+			position:absolute;
+			top:0;
+			left:0;
+			opacity: 0.6;
+			color:white;
+			text-align:center;
+			.sold-out-xj{
+				line-height:160upx;
+				font-size:28upx;
+			}
+			.hide{
+				line-height:160upx;
+				font-size:30upx;
+			}
+		}
+	}
+	.cmd-info_bx {
+		position: relative;
+		padding-left: 177upx;
+
+
+		& .tit {
+			font-size: 30upx;
+			font-weight: bold;
+			color: #333333;
+			overflow: hidden;
+			white-space: nowrap;
+			width:370upx;
+		}
+		.show-color{
+			display:inline-block;
+			width:25upx;
+			height:25upx;
+			background-color:rgb(9, 199, 9);
+			border-radius:15upx;
+			border:none;
+			margin-left:15upx;
+		}
+		.show-tree{
+			display:inline-block;
+			width:25upx;
+			height:25upx;
+			background-color:rgb(230, 8, 19);
+			border-radius:0;
+			border:none;
+			margin-left:16upx;
+		}
+		.show-hole{
+			display:inline-block;
+			width:0;
+			height:0;
+			border-left:14upx solid transparent;
+			border-right:14upx solid transparent;
+			border-bottom:25upx solid rgb(36, 103, 228);
+			margin-left:16upx;
+		}
+		& .kc {
+			color: red;
+			font-size: 27upx;
+			font-weight:bold;
+			padding: 24upx 0 24upx;
+			width:365upx;
+			overflow: hidden;
+			white-space: nowrap;
+		}
+		& .num-open_bx {
+			display: flex;
+			align-items: center;
+			& .price {
+				font-size: 28upx;
+				color: #999999;
+				flex: 1;
+			}
+			& .open-bx {
+				font-size:23upx;
+				color:#333333;
+				width:360upx;
+				overflow:hidden;
+				white-space:nowrap;
+				text{
+					font-size: 23upx;
+					font-weight:700;
+				}
+				text:nth-child(2){
+					font-weight:normal;
+				}
+				*.warn {
+					color: $redColor;
+				}
+			}
+		}
+	}
+}
+</style>

ghsApp/src/admin/item/list2.vue

@@ -135,7 +135,10 @@
 					<button class="action-button" @click="editDesc()">图文介绍</button>
 				</view>
 				<view class="action-button-item">
-					<button class="action-button" @click="shareItem()">分享商品</button>
+					<button class="action-button" @click="onStockChange()">路上库存变动</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="shareItem()">打开分享</button>
 				</view>
 				<view class="action-button-item">
 					<button class="action-button" @click="fetchItemPoster('hd')">批发海报</button>
@@ -146,9 +149,6 @@
 				<view class="action-button-item">
 					<button class="action-button" @click="orderRecord()">下单记录</button>
 				</view>
-				<view class="action-button-item">
-					<button class="action-button" @click="onStockChange()">路上库存变动</button>
-				</view>
 				<view class="action-button-item">
 					<button class="action-button" @click="preSell()">预售</button>
 				</view>
@@ -158,14 +158,11 @@
 				<view class="action-button-item">
 					<button class="action-button" @click="doPart()">拆散</button>
 				</view>
-				<view class="action-button-item">
-					<button class="action-button" @click="delItem()">删除</button>
-				</view>
 				<view class="action-button-item">
 					<button class="action-button" @click="addItemRemark()">增加备注</button>
 				</view>
 				<view class="action-button-item">
-					<button class="action-button" @click="clearItemRemarkFn()">清除备注</button>
+					<button class="action-button" @click="delItem()">删除</button>
 				</view>
 				<view class="action-button-item">
 					<button class="action-button" @click="sendStock()">分配库存</button>

ghsApp/src/admin/item/warning.vue

@@ -49,10 +49,10 @@
                                       <view class="item_list_title" v-if="productItem.className && productItem.className!=''">{{ productItem.className }}</view>
                                       <!-- 下面这个key显示有问题，不要动，动了好像会有问题！！！！ -->
                                       <view class="item-row item-row--h260" :class="{ 'item-row--remark': productItem.itemRemark }" :key="productIndex">
-                                          <ItemStock :info="productItem" @moreAction="moreAction" 
+                                          <ItemStock :info="productItem"
                                           @doPrintLabel="doPrintLabel" @cancelDiscountFn="cancelDiscountFn" @cancelFullOff="cancelFullOff"
-                                          :ref="`productRef${productItem.id}`" @hideChangeFn="hideChangeFn" 
-                                          @cancelPreSellFn="cancelPreSellFn" @cancelLimitBuyFn="cancelLimitBuyFn" @breakSingleItem="breakSingleItem"
+                                          :ref="`productRef${productItem.id}`" @hideChangeFn="hideChangeFn"
+                                          @cancelPreSellFn="cancelPreSellFn" @cancelLimitBuyFn="cancelLimitBuyFn"
                                           @remarkCleared="syncItemRemark($event, '')">
                                           </ItemStock>
                                       </view>
@@ -93,18 +93,6 @@
               </template>
           </modal-module>
   
-          <modal-module :show="moveLabelShow" @click="confirmToLosing" :maskClosable="true" title="挪动数量" padding="30rpx 30rpx" >
-              <template v-slot:content>
-                  <div class="app-modal-input-wrap">
-                  <div class="inp-list-line">
-                      <div class="line-input">
-                      <input type="digit" ref="input" style="width:61.8%;text-align:center;" v-model="moveNum" @focus="moveNum=''" :adjust-position="false" class="inp-input" />
-                      </div>
-                  </div>
-                  </div>
-              </template>
-          </modal-module>
-  
           <uni-popup ref="globalClassImgRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
               <view style="display:flex;padding:20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
                   <view v-for="(item, index) in globalClassData" :key="index" @tap.stop="globalChangeClass(index,item)" style="margin-bottom:20upx;margin-left:3upx;">
@@ -114,94 +102,6 @@
               </view>
           </uni-popup>
   
-          <uni-popup ref="rightShowMore" background-color="#fff" type="center" :animation="true" class="class-popup-style">
-              <view class="action-popup-container">
-                  <view class="action-button-item">
-                      <button class="action-button" @click="costChange()">成本变动</button>
-                  </view>
-                  <view class="action-button-item">
-                      <button class="action-button" @click="avCostChange()">平均成本变动</button>
-                  </view>
-                  <view class="action-button-item">
-                      <button class="action-button" @click="priceChange()">价格变动记录</button>
-                  </view>
-                  <view class="action-button-item">
-                      <button class="action-button" @click="varietyManage()">多颜色</button>
-                  </view>
-                  <view class="action-button-item">
-                      <button class="action-button" @click="copyCreate()">复制新建</button>
-                  </view>
-                  <view class="action-button-item">
-                      <button class="action-button" @click="editDesc()">图文介绍</button>
-                  </view>
-                  <view class="action-button-item">
-                      <button class="action-button" @click="shareItem()">分享商品</button>
-                  </view>
-                  <view class="action-button-item">
-                      <button class="action-button" @click="getMyPoster()">生成海报</button>
-                  </view>
-                  <view class="action-button-item">
-                      <button class="action-button" @click="orderRecord()">下单记录</button>
-                  </view>
-                  <view class="action-button-item">
-                      <button class="action-button" @click="onStockChange()">路上库存变动</button>
-                  </view>
-                  <view class="action-button-item">
-                      <button class="action-button" @click="preSell()">预售</button>
-                  </view>
-                  <view class="action-button-item">
-                      <button class="action-button" @click="doWaste()">报损</button>
-                  </view>
-                  <view class="action-button-item">
-                      <button class="action-button" @click="doPart()">拆散</button>
-                  </view>
-                  <view class="action-button-item">
-                      <button class="action-button" @click="delItem()">删除</button>
-                  </view>
-                  <view class="action-button-item">
-                      <button class="action-button" @click="addItemRemark()">增加备注</button>
-                  </view>
-                  <view class="action-button-item">
-                      <button class="action-button" @click="clearItemRemarkFn()">清除备注</button>
-                  </view>
-                  <view class="action-button-item">
-                      <button class="action-button" @click="sendStock()">分配库存</button>
-                  </view>
-                  <view class="action-button-item">
-                      <button class="action-button" @click="moveToLose()">挪到处理区</button>
-                  </view>
-                  <view class="action-button-item cancel">
-                      <button class="action-button cancel" @click="closeRightShow()">取消</button>
-                  </view>
-              </view>
-          </uni-popup>
-  
-          <item-poster-popup ref="itemPosterPopup" :poster-url="posterUrl" @close="closePoster" @save="downloadPosterImg" />
-  
-          <modal-module :show="wasteShow" @click="wasteConfirm" :maskClosable="true" title="报损数量" padding="30rpx 30rpx" >
-          <template v-slot:content>
-              <view class="app-modal-input-wrap">
-              <view class="inp-list-line">
-              <view class="line-input">
-              <input type="number" ref="input" style="width:61.8%;text-align:center;" @blur="wasteBlur" :focus="wasteFocus" v-model="wasteNum" :adjust-position="false" class="inp-input" />
-              </view>
-              </view>
-          </view>
-          </template>
-              </modal-module>
-  
-          <modal-module :show="partShow" @click="partConfirm" :maskClosable="true" title="拆散数量" padding="30rpx 30rpx" >
-          <template v-slot:content>
-              <view class="app-modal-input-wrap">
-              <view class="inp-list-line">
-              <view class="line-input">
-              <input type="number" ref="input" style="width:61.8%;text-align:center;" @blur="partBlur" :focus="partFocus" v-model="partNum" :adjust-position="false" class="inp-input" />
-              </view>
-              </view>
-          </view>
-          </template>
-          </modal-module>
-  
           <modal-module :show="cancelPreSellShow" @click="cancelPreSellConfirm" :maskClosable="true" title="取消预售" padding="30rpx 30rpx" >
               <template v-slot:content>
                   <view class="app-modal-input-wrap">
@@ -215,78 +115,47 @@
               </template>
           </modal-module>
   
-          <modal-module :show="remarkShow" @click="remarkConfirm" :maskClosable="true" title="花材备注" padding="30rpx 30rpx" >
-          <template v-slot:content>
-              <view class="app-modal-input-wrap">
-              <view class="inp-list-line">
-              <view class="line-input">
-              <input type="text" style="width:90%;text-align:center;" @blur="remarkBlur" :focus="remarkFocus" v-model="remarkText" maxlength="200" :adjust-position="false" class="inp-input" placeholder="请输入备注" />
-              </view>
-              </view>
-          </view>
-          </template>
-          </modal-module>
-  
       </view>
   </template>
   <script>
   import AppSearchModule from "@/components/module/app-search";
   import AppWrapperEmpty from "@/components/app-wrapper-empty";
-  import ItemStock from "./components/item2";
-  import ItemPosterPopup from "./components/item-poster-popup.vue";
-  import itemPosterMixin from "./mixins/itemPosterMixin";
+  import ItemStock from "./components/warningItem";
   import productMins from "@/mixins/product2";
   import { mapGetters } from "vuex";
-  import { getWeixinId } from "@/api/invite";
-  import { print,cancelDiscountPrice,cancelPreSell,delStatusUpdate,cancelFullOffFn } from '@/api/product';
+  import { print,cancelDiscountPrice,cancelPreSell,cancelFullOffFn } from '@/api/product';
   import { cancelLimitBuy } from '@/api/item';
-  import { changeFrontHide,applyAuth,moveToLosing,updateItemRemark,clearItemRemark } from '@/api/item'
+  import { changeFrontHide } from '@/api/item'
   import uniPopup from '@/uni_modules/uni-popup/components/uni-popup/uni-popup.vue';
   import ModalModule from "@/components/plugin/modal"
-  import { partItem } from "@/api/part"
-  import { wastage } from "@/api/order"
   export default {
       name: "list",
       components: {
           AppSearchModule,
           AppWrapperEmpty,
           ItemStock,
-          ItemPosterPopup,
           uniPopup,
           ModalModule
       },
-      mixins: [productMins, itemPosterMixin],
+      mixins: [productMins],
       data() {
           return {
               autoLoad: false,
               selectJobType: "stock",
               tabIndex: 0,
-              getAppIdList:{},
               status:0,
               delStatus:0,
               printItemId:0,
               printType:0,
               printLabelShow:false,
-              moveLabelShow:false,
               printNum:'',
-              moveNum:'',
               printFocus:false,
               warning:0,
-              currentInfo:{},
-              wasteNum:'',
-              wasteShow:false,
-              wasteFocus:false,
-              partNum:'',
-              partShow:false,
-              partFocus:false,
               showClassImg:false,
               priceOption:0,
               cancelPreSellShow: false,
               clearStockOption: -1,
-              cancelPreSellItem: null,
-              remarkShow: false,
-              remarkText: '',
-              remarkFocus: false
+              cancelPreSellItem: null
           };
       },
       computed:{
@@ -296,110 +165,8 @@
       onLoad() {
           uni.setNavigationBarTitle({ title: '库存预警' })
           this.initItem()
-          let that = this
-          getWeixinId().then(res => {
-              that.getAppIdList = res.data
-          })
       },
       methods: {
-          doPart(){
-              this.closeRightShow()
-              this.partShow = true
-              let that = this
-              setTimeout(x => {
-                  this.$nextTick(() => {
-                      that.partFocus = true
-                  })
-              }, 300)
-          },
-          partBlur(){
-              this.partFocus = false
-          },
-          closePartPop(){
-              this.partShow = false
-              this.partFocus = false
-              this.partNum = ''    
-          },
-          partConfirm(val){
-              let that = this
-              if (val.index == 0) {
-                  this.closePartPop()
-                  return
-              }
-              if(Number(that.partNum)<0){
-                  that.$msg('请填写数量')
-                  return false
-              }
-              let product = [{ productId:this.currentInfo.id,bigNum:that.partNum,smallNum:null,classId:0,itemId:this.currentInfo.itemId,ratio:this.currentInfo.ratio }]
-              that.$util.confirmModal({content:'确认拆散？'},() => {
-                  partItem({product:JSON.stringify(product),remark:''}).then((res) => {
-                      if(res.code == 1){
-                          that.closePartPop()
-                          that.$msg('拆散成功')
-                      }
-                  })
-              })
-          },
-          doWaste(){
-              this.closeRightShow()
-              this.wasteShow = true
-              let that = this
-              setTimeout(x => {
-                  this.$nextTick(() => {
-                      that.wasteFocus = true
-                  })
-              }, 300)
-          },
-          wasteBlur(){
-              this.wasteFocus = false
-          },
-          closeWastePop(){
-              this.wasteShow = false
-              this.wasteFocus = false
-              this.wasteNum = ''    
-          },
-          wasteConfirm(val){
-              let that = this
-              if (val.index == 0) {
-                  this.closeWastePop()
-                  return
-              }
-              if(Number(that.wasteNum)<0){
-                  that.$msg('请填写数量')
-                  return false
-              }
-              let product = [{ productId:this.currentInfo.id,bigNum:that.wasteNum,smallNum:null,classId:0,itemId:this.currentInfo.itemId,ratio:this.currentInfo.ratio }]
-              that.$util.confirmModal({content:'确认报损？'},() => {
-                  wastage({product:JSON.stringify(product),remark:''}).then((res) => {
-                      if(res.code == 1){
-                          that.closeWastePop()
-                          that.$msg('报损成功')
-                      }
-                  });
-              })
-          },
-          moveToLose(){
-              this.moveLabelShow = true
-              this.moveNum = this.currentInfo.stock?parseFloat(this.currentInfo.stock):0
-          },
-          confirmToLosing(val){
-              let that=this;
-              if (val.index == 0) {
-                  that.moveLabelShow = false
-                  that.moveNum = ''
-                  return
-              }
-              that.$util.confirmModal({content:'确定挪动？'},() => {
-                  moveToLosing({id:this.currentInfo.id,num:that.moveNum}).then(res=>{
-                      if(res.code == 1){
-                          that.$msg(res.msg)
-                          that.moveLabelShow = false
-                          that.moveNum = ''
-                          that.closeRightShow()
-                      }
-                  })
-              })
-          },
           goSearchFn(){
               this.searchFn()			
           },
@@ -489,9 +256,6 @@
                   })
               })
           },
-          sendStock(){
-              this.pageTo({url: '/admin/item/sendStock?id='+this.currentInfo.id+'&price='+this.currentInfo.price+'&stock='+this.currentInfo.stock+'&name='+this.currentInfo.name,type:2})
-          },
           selectFlowerNumFn(){
               this.showClassImg = true
               this.$refs.globalClassImgRef.open('top')
@@ -549,62 +313,7 @@
                   }
               })
           },
-          addItemRemark(){
-              this.closeRightShow()
-              this.remarkText = this.currentInfo.itemRemark || ''
-              this.remarkShow = true
-              let that = this
-              setTimeout(() => {
-                  that.$nextTick(() => {
-                      that.remarkFocus = true
-                  })
-              }, 300)
-          },
-          remarkBlur(){
-              this.remarkFocus = false
-          },
-          closeRemarkPop(){
-              this.remarkShow = false
-              this.remarkFocus = false
-              this.remarkText = ''
-          },
-          remarkConfirm(val){
-              let that = this
-              if (val.index == 0) {
-                  this.closeRemarkPop()
-                  return
-              }
-              const text = (that.remarkText || '').trim()
-              if (!text) {
-                  that.$msg('请填写备注')
-                  return
-              }
-              updateItemRemark({ id: that.currentInfo.id, itemRemark: text }).then(res => {
-                  if (res.code == 1) {
-                      that.syncItemRemark(that.currentInfo.id, text)
-                      that.closeRemarkPop()
-                      that.$msg(res.msg || '保存成功')
-                  }
-              })
-          },
-          clearItemRemarkFn(){
-              let that = this
-              this.closeRightShow()
-              if (!that.currentInfo.itemRemark) {
-                  that.$msg('暂无备注')
-                  return
-              }
-              that.$util.confirmModal({ content: '确定清除备注？' }, () => {
-                  clearItemRemark({ id: that.currentInfo.id }).then(res => {
-                      if (res.code == 1) {
-                          that.syncItemRemark(that.currentInfo.id, '')
-                          that.$msg(res.msg || '清除成功')
-                      }
-                  })
-              })
-          },
           syncItemRemark(id, itemRemark){
-              this.currentInfo.itemRemark = itemRemark
               if (!this.$util.isEmpty(this.globalItemData)) {
                   this.globalItemData.forEach((item, index) => {
                       if (item.id == id) {
@@ -613,130 +322,6 @@
                   })
               }
           },
-          closeRightShow(){
-              this.$refs.rightShowMore.close()
-          },
-          costChange(){
-              this.closeRightShow()
-              this.pageTo({url: '/admin/changePrice/costChangeList?id='+this.currentInfo.id})
-          },
-          avCostChange(){
-              this.closeRightShow()
-              this.pageTo({url: '/pagesStorehouse/stockWarn/detailed?id='+this.currentInfo.id+'&name='+this.currentInfo.name})
-          },
-          ptAuth(){
-              let that = this
-              that.$util.confirmModal({content:'确认申请?'},() => {
-                  applyAuth({id:this.currentInfo.id}).then(res=>{
-                      if(res.code == 1){
-                          that.closeRightShow()
-                          that.$msg('已提交申请')
-                      }
-                  })
-              })
-          },
-          delItem(){
-              let that = this
-              that.$util.confirmModal({content:'确认删除?'},() => {
-                  delStatusUpdate({id:this.currentInfo.id,delStatus:1}).then(res=>{
-                      if(res.code == 1){
-                          that.closeRightShow()
-                          that.$msg('删除成功')
-                      }
-                  })
-              })
-          },
-          onStockChange(){
-              this.closeRightShow()
-              this.pageTo({url: '/pagesStorehouse/stockWarn/onStockChange?id='+this.currentInfo.id+'&name='+this.currentInfo.name})
-          },
-          priceChange(){
-              this.closeRightShow()
-              this.pageTo({url: '/admin/changePrice/changeList?id='+this.currentInfo.id})
-          },
-          varietyManage(){
-              this.closeRightShow()
-              this.pageTo({url: "/admin/item/xjSelect?itemId="+this.currentInfo.id})
-          },
-          copyCreate(){
-              this.closeRightShow()
-              this.pageTo({url: '/admin/item/copy?id='+this.currentInfo.id})
-          },
-          orderRecord(){
-              this.closeRightShow()
-              this.pageTo({url: "/admin/order/productOrder?productId="+this.currentInfo.id})
-          },
-          preSell(){
-              this.closeRightShow()
-              this.pageTo({url: "/admin/item/presell?id="+this.currentInfo.id})
-          },
-          moreAction(item){
-              this.currentInfo = item
-              this.$refs.rightShowMore.open('top')
-          },
-          shareItem() {
-              let that = this
-              let id = this.currentInfo.id
-              this.closeRightShow()
-              // #ifdef MP-WEIXIN
-              console.log('admin/ghsProduct/detail?shopId='+ that.loginInfo.shopId+'&id=0&ghsShopAdminId='+that.loginInfo.shopAdminId+'&id='+id)
-              uni.navigateToMiniProgram({
-                  //姜枫-2021.04.13
-                  appId: that.getAppIdList.hd.miniAppId,
-                  path: 'admin/ghsProduct/detail?shopId='+ that.loginInfo.shopId+'&ghsShopAdminId='+that.loginInfo.shopAdminId+'&id='+id,
-                  //develop 开发版 trial 体验版 release 正式版
-                  envVersion: process.env.NODE_ENV === 'development' ? 'develop' : 'release',
-                  extraData: {
-                      'shopId': that.loginInfo.shopId,
-                      'id': 0,
-                      'name':'',
-                  },
-                  success (res) {
-                  }
-              })
-              // #endif
-              // #ifdef APP-PLUS
-              if(plus.runtime.isApplicationExist({pname:'com.tencent.mm',action:'weixin://'})){
-                  var sweixin
-                  plus.share.getServices(function(s){
-                      for (var i = 0; i < s.length; i++) {
-                          var t = s[i];
-                          if (t.id == 'weixin') {
-                              sweixin = t;
-                          }
-                      }
-                      let miniOriginalId = that.dictInfo.miniOriginalId && that.dictInfo.miniOriginalId.current && that.dictInfo.miniOriginalId.current.hd ? that.dictInfo.miniOriginalId.current.hd : ''
-                      if (sweixin) { //&& sweixin.nativeClient
-                          sweixin.launchMiniProgram({
-                              id: miniOriginalId,
-                              path: 'admin/ghsProduct/detail?shopId='+ that.loginInfo.shopId+'&ghsShopAdminId='+that.loginInfo.shopAdminId+'&id='+id,
-                              type: 0
-                          });
-                      } else {
-                          that.$msg('没有找到微信服务');
-                          return false;
-                      }
-                  }, function(e){
-                      that.$msg("没有找到微信服务哦")
-                      //that.$msg("获取微信失败：" + e.message)
-                      //console.log(JSON.stringify(e));
-                  });
-              }else{
-                  this.$msg("请安装微信，再打开小程序")
-                  return false
-              }
-              // #endif
-          },
-          affirm(val) {
-              if (val.index === 0) {
-                  this.modalCancel();
-              } else {
-              }
-          },
-          editDesc() {
-              this.closeRightShow()
-              this.pageTo({url: '/admin/item/picTextAdd-Edit?itemId='+this.currentInfo.id})
-          }
       }
   };
   </script>
@@ -831,18 +416,6 @@
       z-index:999999;
   }
   
-  .action-popup-container {
-      display: grid;
-      grid-template-columns: 1fr 1fr;
-      gap: 24upx;
-      padding: 50upx 40upx 60upx 40upx;
-      max-height: 99vh;
-      overflow-y: auto;
-      width: 92vw;
-      max-width: 650upx;
-      margin: 0 auto;
-  }
-  
   .modern-tabs-container {
     padding: 0;
     background-color: #f8f9fa;
@@ -915,46 +488,5 @@
     }
   }
   
-  .action-button-item {
-      &.cancel {
-          grid-column: 1 / -1;
-          margin-top: 30upx;
-      }
-  }
-  
-  .action-button {
-      width: 100%;
-      height: 120upx;
-      border: 2upx solid #d0d7de;
-      border-radius: 16upx;
-      background: #ffffff;
-      color: #24292f;
-      font-size: 34upx;
-      font-weight: 600;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      box-shadow: 0 4upx 12upx rgba(0, 0, 0, 0.1);
-      transition: all 0.15s ease;
-      line-height: 1.2;
-      
-      &:active {
-          background: #f6f8fa;
-          transform: scale(0.96);
-          border-color: #8c959f;
-      }
-      
-      &.cancel {
-          background: #f6f8fa;
-          color: #656d76;
-          border-color: #d0d7de;
-          font-size: 32upx;
-          
-          &:active {
-              background: #eaeef2;
-              border-color: #8c959f;
-          }
-      }
-  }
   </style>
   

ghsApp/src/components/module/itemRemarkBar.vue

@@ -8,7 +8,7 @@
 			v-if="showCancelBtn"
 			class="item-remark-bar__cancel"
 			@click.stop="onCancelRemark"
-		>取消</text>
+		>删除备注</text>
 	</view>
 </template>
 

hdApp/src/components/module/itemRemarkBar.vue

@@ -8,7 +8,7 @@
 			v-if="showCancelBtn"
 			class="item-remark-bar__cancel"
 			@click.stop="onCancelRemark"
-		>取消</text>
+		>删除备注</text>
 	</view>
 </template>