shish 5 yıl önce
ebeveyn
işleme
079d69e457

+ 12 - 15
ghsApp/src/admin/billing/priceChange.vue

@@ -5,27 +5,24 @@
                          @input="searchFnContrapose" />
                          @input="searchFnContrapose" />
     </view>
     </view>
     <view class="scroll-middle_bx">
     <view class="scroll-middle_bx">
-      <!--<scroll-view scroll-y class="right-box" :scroll-into-view="scrollClassId"></scroll-view>-->
         <!--内容部分 start -->
         <!--内容部分 start -->
         <block v-if="!$util.isEmpty(filterProductInfoContrapose)">
         <block v-if="!$util.isEmpty(filterProductInfoContrapose)">
-									<view style="width:100%;padding: 30rpx">
-										<template v-for="(productItem, productIndex) in filterProductInfoContrapose">
-										<Commondity :type="COMMODITY_TYPE.CHANGE"
-																						:key="productIndex"
-																						:info="productItem"
-																						:autoPrice="productItem.priceLabel=='2'?productItem.price:null"
-                    ></Commondity>
-									</template>
-										<!--:autoPrice="productItem.priceLabel=='2'?getSelectItemById(productItem.id).autoPrice:null"-->
-									</view>
+          <view style="width:100%;padding: 30rpx">
+            <template v-for="(productItem, productIndex) in filterProductInfoContrapose">
+              <Commondity :type="COMMODITY_TYPE.CHANGE"
+                                      :key="productIndex"
+                                      :info="productItem"
+                                      :autoPrice="productItem.priceLabel=='2'?productItem.price:null"
+              ></Commondity>
+            </template>
+          </view>
         </block>
         </block>
         <block v-else>
         <block v-else>
-									<view style="width: 100%">
-										<app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(filterProductInfoContrapose)" />
-									</view>
+          <view style="width: 100%">
+            <app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(filterProductInfoContrapose)" />
+          </view>
         </block>
         </block>
         <!--内容部分 end -->
         <!--内容部分 end -->
-
     </view>
     </view>
   </view>
   </view>
 </template>
 </template>

+ 0 - 12
ghsApp/src/components/module/app-commodity.vue

@@ -1,8 +1,5 @@
 <template>
 <template>
 	<view class="item-cmd_bx" @click="customNum">
 	<view class="item-cmd_bx" @click="customNum">
-<!--		<view class="img_bx" @click="addEvents">-->
-<!--			<app-img  :src="info.cover" alt="商品图" mode="aspectFit" :height="160" />-->
-<!--		</view>-->
 		<view class="img_bx" style="background:#eeeeee">
 		<view class="img_bx" style="background:#eeeeee">
 			<image :src="info.cover" v-if="isImg"></image>
 			<image :src="info.cover" v-if="isImg"></image>
 		</view>
 		</view>
@@ -25,14 +22,10 @@
 				</view>
 				</view>
 			</view>
 			</view>
 			<view class="num-open_bx flex-space" v-if="type == COMMODITY_TYPE.CHANGE">
 			<view class="num-open_bx flex-space" v-if="type == COMMODITY_TYPE.CHANGE">
-				<!--<view class="price" v-if="!offPrice">¥{{ showPrice }}</view>-->
 				<view class="price cs" v-if="!offPrice">¥{{	oldPrice }}</view>
 				<view class="price cs" v-if="!offPrice">¥{{	oldPrice }}</view>
-
 				<view class="price" v-else></view>
 				<view class="price" v-else></view>
-
 				<view class="open-bx" style="padding-bottom: 40rpx" >
 				<view class="open-bx" style="padding-bottom: 40rpx" >
 					<input class="change-input"  @focus="showPrice = null"  v-model="showPrice" type="digit" placeholder="自动调价"   />
 					<input class="change-input"  @focus="showPrice = null"  v-model="showPrice" type="digit" placeholder="自动调价"   />
-					<!--<input class="change-input" @tap.stop="" @focus="changeAutoPrice = null" v-model="changeAutoPrice" type="digit" placeholder="自动调价"  selection-start="0" selection-end="1" />-->
 					<view style="width: 80rpx;text-align: center;color: red">
 					<view style="width: 80rpx;text-align: center;color: red">
 						{{Number(oldPrice)>Number(showPrice)&&Number(showPrice)>0?((Number(showPrice)/Number(oldPrice)).toFixed(2)*10).toFixed(1)+'折':''}}
 						{{Number(oldPrice)>Number(showPrice)&&Number(showPrice)>0?((Number(showPrice)/Number(oldPrice)).toFixed(2)*10).toFixed(1)+'折':''}}
 					</view>
 					</view>
@@ -48,18 +41,13 @@
 import { COMMODITY_TYPE } from "@/utils/declare";
 import { COMMODITY_TYPE } from "@/utils/declare";
 import AppImg from "@/components/app-img";
 import AppImg from "@/components/app-img";
 import { autoPriceByIdApi, changePriceByIdApi } from '@/api/product/index'
 import { autoPriceByIdApi, changePriceByIdApi } from '@/api/product/index'
-// import productMins from "@/mixins/productContrapose";
 import animationMins from "@/mixins/animation";
 import animationMins from "@/mixins/animation";
-
 import allSelectInput from "@/components/module/allSelectInput";
 import allSelectInput from "@/components/module/allSelectInput";
 import allSelectInputMins from "@/mixins/allSelectInput";
 import allSelectInputMins from "@/mixins/allSelectInput";
-//报错暂时注释
-//import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue'
 export default {
 export default {
 	name: "Commodity",
 	name: "Commodity",
 	components: {
 	components: {
 		AppImg,allSelectInput
 		AppImg,allSelectInput
-		//easyLoadimage
 	},
 	},
 	mixins: [animationMins,allSelectInputMins],
 	mixins: [animationMins,allSelectInputMins],
 	props: {
 	props: {

+ 1 - 2
ghsApp/src/pagesPurchase/add.vue

@@ -129,9 +129,8 @@ export default {
 	data() {
 	data() {
 		return {
 		return {
 			pageType: "purchase",
 			pageType: "purchase",
-
 			isFocus: false,
 			isFocus: false,
-			isReserve: true,
+			isReserve: true,//采购时记住已经选择的花材
 			isAloneAllActive: false,
 			isAloneAllActive: false,
 			isAloneAllFocus: false,
 			isAloneAllFocus: false,