shish %!s(int64=2) %!d(string=hai) anos
pai
achega
12717db073

+ 3 - 22
ghsApp/src/admin/cp/addCp.vue

@@ -5,7 +5,7 @@
 
 
         <tui-list-cell class="line-cell" :hover="false">
         <tui-list-cell class="line-cell" :hover="false">
           <div class="tui-title">名称</div>
           <div class="tui-title">名称</div>
-          <input v-model="form.name" placeholder-class="phcolor" class="tui-input" name="name" placeholder="产品名称" @input="fillName($event)" maxlength="50" type="text" />
+          <input v-model="form.name" placeholder-class="phcolor" class="tui-input" name="name" placeholder="产品名称" maxlength="50" type="text" />
         </tui-list-cell>
         </tui-list-cell>
 
 
         <tui-list-cell class="line-cell" :hover="false">
         <tui-list-cell class="line-cell" :hover="false">
@@ -15,12 +15,7 @@
           </view>
           </view>
         </tui-list-cell>
         </tui-list-cell>
 
 
-        <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">拼音缩写</div>
-          <input v-model="form.py" placeholder-class="phcolor" class="tui-input" name="py" placeholder="拼音首字母组合" maxlength="50" type="text" />
-        </tui-list-cell>
-
-        <tui-list-cell class="line-cell" :arrow="true">
+        <tui-list-cell class="line-cell" :hover="false" :arrow="true">
           <div class="tui-title">分类</div>
           <div class="tui-title">分类</div>
           <input v-model="form.classId" name="classId" type="text" hidden />
           <input v-model="form.classId" name="classId" type="text" hidden />
           <view style="color:#CCCCCC;width:450upx;height:45upx;" @click.stop="changeClass()" v-if="form.classId == 0">
           <view style="color:#CCCCCC;width:450upx;height:45upx;" @click.stop="changeClass()" v-if="form.classId == 0">
@@ -78,7 +73,7 @@
   import { getAllItemClass } from "@/api/item-class";
   import { getAllItemClass } from "@/api/item-class";
   import { getAllUnit } from "@/api/unit";
   import { getAllUnit } from "@/api/unit";
   import { getAllCpClass,addCpFn,updateCpFn } from "@/api/cp"
   import { getAllCpClass,addCpFn,updateCpFn } from "@/api/cp"
-  import { addProduct,updateProduct,getProductDetail,py } from "@/api/product";
+  import { addProduct,updateProduct,getProductDetail } from "@/api/product";
   import { getPtItemDetail } from "@/api/pt-item";
   import { getPtItemDetail } from "@/api/pt-item";
   import { mapGetters } from "vuex"
   import { mapGetters } from "vuex"
   //图片上传插件来源:https://ext.dcloud.net.cn/plugin?id=2922 已改造,不能再升级 shish 20211228
   //图片上传插件来源:https://ext.dcloud.net.cn/plugin?id=2922 已改造,不能再升级 shish 20211228
@@ -98,7 +93,6 @@
         form: {
         form: {
           id:0,
           id:0,
           name:"",
           name:"",
-          py:"",
           classId:0,
           classId:0,
           className:'',
           className:'',
           cover:[],
           cover:[],
@@ -154,14 +148,6 @@
           this.form.status = 2
           this.form.status = 2
         }
         }
       },
       },
-      fillName(event){
-        let val = event.target.value
-        py({ name:val }).then(res => {
-          if(res.data.py){
-            this.form.py = res.data.py
-          }
-        });
-      },
       goBack(){
       goBack(){
         uni.navigateBack({ delta: 1 })
         uni.navigateBack({ delta: 1 })
       },
       },
@@ -289,11 +275,6 @@
             rule: ["required"],
             rule: ["required"],
             msg: ["请填写名称"]
             msg: ["请填写名称"]
           },
           },
-          {
-            name: "py",
-            rule: ["required"],
-            msg: ["请填写拼音缩写"]
-          },
           {
           {
             name: "classId",
             name: "classId",
             rule: ["required"],
             rule: ["required"],

+ 6 - 20
ghsApp/src/admin/cp/components/cpItem.vue

@@ -8,43 +8,29 @@
 			<view v-if="info.status == 2" class="sold-out">
 			<view v-if="info.status == 2" class="sold-out">
 				<view class="sold-out-xj">已下架</view>
 				<view class="sold-out-xj">已下架</view>
 			</view>
 			</view>
-			<image :src="info.cover" style="width:160upx;height:160upx;" lazy-load="true" :lazy-load-margin="0"></image>
+			<image :src="info.cover" style="width:160upx;height:160upx;border-radius:10upx;" lazy-load="true" :lazy-load-margin="0"></image>
 
 
 		</view>
 		</view>
 		<view class="cmd-info_bx active" @click="doIt(info)">
 		<view class="cmd-info_bx active" @click="doIt(info)">
 			<view class="tit">
 			<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 #3385ff;color:white;background-color:#3385ff;margin-right:5upx;padding-left:5upx;padding-right:5upx;" 
-				v-if="info.presell == 1">预售</text>
 				{{ info.name }}
 				{{ info.name }}
-				<text v-if="info.variety && info.variety ==1" class="show-color"></text>
 			</view>
 			</view>
 			<view class="kc">
 			<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;11upx;font-weight:normal;">¥{{ info.skPrice?parseFloat(info.skPrice):0 }}</text>
-				<text style="margin-left:14upx;color:#3385FF;11upx;font-weight:normal;" v-if="info.reachNum && info.reachNum>0 && info.reachNumDiscount && info.reachNumDiscount>0">{{info.reachNum}}↓{{info.reachNumDiscount?parseFloat(info.reachNumDiscount):0}}</text>
+				<text style="color:green;font-weight:normal;">{{ info.miniPrice?parseFloat(info.miniPrice):0 }} - {{ info.maxPrice?parseFloat(info.maxPrice):0 }}</text>
 			</view>
 			</view>
 			<view class="num-open_bx">
 			<view class="num-open_bx">
 				<template>
 				<template>
 					<view class="open-bx">
 					<view class="open-bx">
-						剩<text style="font-size:23upx;">{{ info.stock?parseFloat(info.stock):0 }}</text>
+						剩<text style="font-size:23upx;margin-left:9upx;">{{ 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;" 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.cost ? parseInt(info.cost) : 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>
+						<text style="margin-left:9upx;font-size:23upx;display:inline-block;color:#999;font-weight:normal;">成本 {{ info.cost ? parseInt(info.cost) : 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>
 					</view>
 					</view>
 				</template>
 				</template>
 			</view>
 			</view>
 		</view>
 		</view>
 	</view>
 	</view>
-	<text class="bottom-button">更多</text>
-	<text class="bottom-button">库存明细</text>
-	<text class="bottom-button">打标签</text>
-	<text class="bottom-button">打价码</text>
+	<text class="bottom-button">花材列表</text>
 </view>
 </view>
 </template>
 </template>
 <script>
 <script>

+ 4 - 4
ghsApp/src/admin/cp/components/term.vue

@@ -29,10 +29,10 @@
 			<view class="num-open_bx">
 			<view class="num-open_bx">
 				<template>
 				<template>
 					<view class="open-bx">
 					<view class="open-bx">
-						剩<text style="font-size:23upx;">{{ info.detail.stock?parseFloat(info.detail.stock):0 }}</text>
-						<text style="margin-left:9upx;font-size:23upx;" v-if="info.detail.onStock>0">路上<text style="font-weight:700;">{{info.detail.onStock}}</text></text>
-						<text style="margin-left:9upx;font-size:23upx;display:inline-block;color:#999;font-weight:normal;">成本{{ info.detail.cost ? parseInt(info.detail.cost) : 0 }}</text>
-						<text style="margin-left:9upx;font-size:23upx;display:inline-block;color:#999;font-weight:normal;">销{{ info.detail.actualSold ? parseInt(info.detail.actualSold) : 0 }}</text>
+						剩<text style="font-size:23upx;margin-left:9upx;">{{ info.detail.stock?parseFloat(info.detail.stock):0 }}</text>
+						<text style="margin-left:9upx;font-size:23upx;" v-if="info.detail.onStock>0">路上 <text style="font-weight:700;">{{info.detail.onStock}}</text></text>
+						<text style="margin-left:9upx;font-size:23upx;display:inline-block;color:#999;font-weight:normal;">成本 {{ info.detail.cost ? parseInt(info.detail.cost) : 0 }}</text>
+						<text style="margin-left:9upx;font-size:23upx;display:inline-block;color:#999;font-weight:normal;">销{{ info.detail.actualSold ? parseInt(info.detail.actualSold) : 0 }}</text>
 						<text style="margin-left:9upx;font-size:23upx;display:inline-block;color:#999;font-weight:normal;">
 						<text style="margin-left:9upx;font-size:23upx;display:inline-block;color:#999;font-weight:normal;">
 							{{info.detail.ratioType == 0 ? info.detail.ratio :'若干'}}支
 							{{info.detail.ratioType == 0 ? info.detail.ratio :'若干'}}支
 						</text>
 						</text>

+ 3 - 0
ghsApp/src/admin/cp/list.vue

@@ -162,6 +162,9 @@
         })
         })
       },
       },
       methods: {
       methods: {
+        selectFlowerNumFn(){
+            this.$msg('开发中')
+        },
         doIt(info){
         doIt(info){
             if(this.skip == 0){
             if(this.skip == 0){
                 this.$util.pageTo({url: '/admin/cp/item?cpId='+info.id})
                 this.$util.pageTo({url: '/admin/cp/item?cpId='+info.id})

+ 1 - 1
ghsApp/src/admin/item/add.vue

@@ -51,7 +51,7 @@
           <input v-model="form.stock" style="width:340upx;" placeholder-class="phcolor" @focus="form.stock=''" @input="changeStock($event)" class="tui-input" name="stock" placeholder="请输入" type="digit"/>
           <input v-model="form.stock" style="width:340upx;" placeholder-class="phcolor" @focus="form.stock=''" @input="changeStock($event)" class="tui-input" name="stock" placeholder="请输入" type="digit"/>
         </tui-list-cell>
         </tui-list-cell>
 
 
-        <tui-list-cell class="line-cell" :arrow="true">
+        <tui-list-cell class="line-cell" :hover="false" :arrow="true">
           <div class="tui-title">分类</div>
           <div class="tui-title">分类</div>
           <input v-model="form.classId" name="classId" type="text" hidden />
           <input v-model="form.classId" name="classId" type="text" hidden />
           <view style="color:#CCCCCC;width:450upx;height:45upx;" @click.stop="changeClass()" v-if="form.classId == 0">
           <view style="color:#CCCCCC;width:450upx;height:45upx;" @click.stop="changeClass()" v-if="form.classId == 0">