商品

hdApp/src/admin/billing/affirm.vue

@@ -245,7 +245,7 @@ export default {
 				return { productId: ele.id, bigNum: ele.bigCount, smallNum: ele.smallCount,classId:ele.classId,itemId:ele.itemId };
 			});
 			let options = {
-				orderType:2,// 开单类型，1成品开单 2花材开单
+				orderType:2,// 开单类型，1商品开单 2花材开单
 				packingFee:this.packingMoney,// 包装费
 				sendCost:this.freight,// 运费
 				customId:this.clientInfo.id,// 客户

hdApp/src/admin/billing/affirmGoods.vue

@@ -246,7 +246,7 @@ export default {
 				}
 			});
 			let options = {
-				orderType:1,// 开单类型，1成品开单 2花材开单
+				orderType:1,// 开单类型，1商品开单 2花材开单
 				sendCost:this.freight,// 运费
 				customId:this.clientInfo.id,// 客户
 				payWay:this.payType,//付款方式

hdApp/src/admin/billing/customerPlace.vue

@@ -185,7 +185,7 @@ export default {
 					name: "花材"
 				},
 				{
-					name: "成品"
+					name: "商品"
 				}
 				// {
 				//     name: '课程'

hdApp/src/admin/billing/index.vue

@@ -9,7 +9,7 @@
 			<app-search-module v-model="py" placeholder="请输入关键词，支持拼音首字母搜索" @input="suitSearchFn" />
 		</view>
 		<view class="scroll-middle_bx">
-			<!--成品-->
+			<!--商品-->
 			<scroll-view scroll-y scroll-with-animation class="tab-view" :scroll-top="scrollTop" v-show="tabIndex == 0">
 				<div v-for="(item, index) in suitFilterProductInfo" :key="index" class="tab-bar-item" :class="[suitClassIndex == index ? 'active' : '']" :data-current="index" @tap.stop="suitSwichClass(index)">
 					<text>{{ item.className || "" }}</text>
@@ -188,7 +188,7 @@ export default {
 			COMMODITY_TYPE,
 			tabIndex: null,
 			tabs: [
-				{	name: "成品"	},
+				{	name: "商品"	},
 				{	name: "花材"	},
 				{	name: '培训班'	},
 			],
@@ -349,7 +349,7 @@ export default {
 				switch (e.index){
 					case 0:
 						if(this.$util.isEmpty(this.suitInfo)){
-							this.initGoodsData();//成品
+							this.initGoodsData();//商品
 						}
 					break;
 					case 1:

hdApp/src/admin/billing/result.vue

@@ -58,7 +58,7 @@
       <button class="admin-button-com big" @click="gotoDetail">订单详情</button>
       <view style="text-align: center;color: #868686;margin-top: 30upx;" v-if="option.type === 'zuhe' && isGroup">
         <view class="iconfont iconchenggong" style="color:#049E2C;margin-bottom:15upx;font-size:80upx;" ></view>
-        <view>保存成功，请在【开单 - 成品】查看</view>
+        <view>保存成功，请在【开单 - 商品】查看</view>
       </view>
       <view class="zuhe-box" v-if="option.type === 'zuhe' && !isGroup">
         <view class="">

hdApp/src/admin/goods/category.vue

@@ -108,7 +108,7 @@ export default {
                     name: '绿植盆栽资材'
                 }
             ],
-			//0 绿植盆栽资材 1 鲜花成品
+			//0 绿植盆栽资材 1 鲜花商品
             flower:1,
 			catDisabled:false
 		}

hdApp/src/admin/home/apply.vue

@@ -29,13 +29,13 @@ export default {
     return {
       menuList: [
         {
-            title:'成品花材',
+            title:'商品花材',
             list:[
                 {name: "花材",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/item/list",pf:1},
                 {name: "停用花材",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/item/list?delStatus=1",pf:1},
                 {name: "花材分类",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/itemClass/list",pf:1},
-                { name: "成品", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/list",pf:1},
-                { name: "成品分类", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/category",pf:1},
+                { name: "商品", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/list",pf:1},
+                { name: "商品分类", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/category",pf:1},
                 { name: "涨价设置", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/price-increase",pf:1},
                 { name: "运费规则", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/freight",pf:1}
             ]

hdApp/src/admin/home/workbench.vue

@@ -99,8 +99,8 @@ export default {
         { name: "供应商", img: `${this.$constant.imgUrl}/ghs/home/icon_ghs.png`, url: "/pagesPurchase/order",pf:0 },
         { name: "采购单", img: `${this.$constant.imgUrl}/ghs/home/icon_caigou.png`, url: "/pagesPurchase/shopping",pf:0 },
         { name: "采购结账单", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/clear/list",pf:0 },
-        { name: "成品", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/list",pf:1 },
-        { name: "成品采购单", img: `${this.$constant.imgUrl}/ghs/home/icon_caigou.png`, url: "/admin/goods/plantCg",pf:1},
+        { name: "商品", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/list",pf:1 },
+        { name: "商品采购单", img: `${this.$constant.imgUrl}/ghs/home/icon_caigou.png`, url: "/admin/goods/plantCg",pf:1},
         { name: "报损单", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/breakage/list",pf:1},
         { name: "员工", img: `${this.$constant.imgUrl}/ghs/home/yggl.png`, url: "/admin/staff/list",pf:0 },
         { name: "花材分类", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/itemClass/list",pf:1},

hdApp/src/admin/work/add.vue

@@ -6,7 +6,7 @@
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">名称</view>
           <input v-model="form.name" placeholder-class="phcolor" class="tui-input" name="name" @focus="form.name=''" placeholder="请填写名称" maxlength="50" type="text" />
-          <button class="admin-button-com big blue" style="width:190upx;" @click="selectMake()">选款式</button>
+          <button class="admin-button-com big blue" style="width:190upx;" @click="selectMake()">选商品</button>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">

hdApp/src/api/category/index.js

@@ -17,35 +17,35 @@ export const getList = data => {
 // =====================  B 端 ========================
 
 /** *
- * 成品分类-列表（全部分类无分页） b
+ * 商品分类-列表（全部分类无分页） b
  */
 export const getClassB = data => {
 	return https.get('/category/list', data)
 }
 
 /** *
- * 成品分类-查看 b
+ * 商品分类-查看 b
  */
 export const getClassDetB = data => {
 	return https.get('/category/detail', data)
 }
 
 /** *
- * 成品分类-添加 b
+ * 商品分类-添加 b
  */
 export const classAddB = data => {
 	return https.get('/category/add', data)
 }
 
 /** *
- * 成品分类-修改 b
+ * 商品分类-修改 b
  */
 export const classUpdateB = data => {
 	return https.get('/category/update', data)
 }
 
 /** *
- * 成品分类-修改 b
+ * 商品分类-修改 b
  */
 export const changeStatusB = data => {
 	return https.get('/category/change-status', data)

hdApp/src/api/goods/index.js

@@ -92,42 +92,42 @@ export const usageListB = data => {
 }
 
 /** *
- * 成品分类-列表（无分页） b
+ * 商品分类-列表（无分页） b
  */
 export const categoryListB = data => {
 	return https.get('/category/list', data)
 }
 
 /** *
- * 成品分类-查看 b
+ * 商品分类-查看 b
  */
 export const categoryDetB = data => {
 	return https.get('/category/detail', data)
 }
 
 /** *
- * 成品分类-添加 b
+ * 商品分类-添加 b
  */
 export const categoryAddB = data => {
 	return https.post('/category/add', data)
 }
 
 /** *
- * 成品分类-更新 b
+ * 商品分类-更新 b
  */
 export const categoryUpdateB = data => {
 	return https.post('/category/update', data)
 }
 
 /** *
- * 成品分类-更新 b
+ * 商品分类-更新 b
  */
 export const categoryDelB = data => {
 	return https.get('/category/delete', data)
 }
 
 /** *
- * 成品分类-启用停用 b
+ * 商品分类-启用停用 b
  */
 export const categoryStatusB = data => {
 	return https.get('/category/change-status', data)

hdApp/src/api/product/index.js

@@ -62,7 +62,7 @@ export const getPxClassDataApi = data => {
 	return https.get("/px-class/list", data);
 };
 /** *
-	* 成品开单列表 
+	* 商品开单列表 
 */
 export const getGoodsDataApi = data => {
 	return https.get("/goods/index", data);

hdApp/src/mixins/autoUpdate.js

@@ -9,13 +9,10 @@ export default {
     onLoad(){
         // #ifdef APP-PLUS
         plus.runtime.getProperty(plus.runtime.appid,(wgtinfo)=>{
-            console.log(JSON.stringify(wgtinfo));
-            console.log(wgtinfo.version);
             this.version = wgtinfo.version
         });
         uni.getSystemInfo({  
-            success:(res) => {  
-                console.log(res.platform);  
+            success:(res) => {
                 //检测当前平台，如果是安卓则启动安卓更新  
                 if(res.platform=="android"){  
                     this.androidCheckUpdate()   

hdApp/src/mixins/cgProduct.js

@@ -8,8 +8,8 @@ export default {
 			options:'',
 			pageType: "bill", //选择商品页面类别  用于区分不同功能的数据
 
-			suitInfo: [], //成品-商品信息
-			suitClassIndex: 0, //成品-当前商品类别下标
+			suitInfo: [], //商品-商品信息
+			suitClassIndex: 0, //商品-当前商品类别下标
 
 			productInfo: [], //商品信息
 			pxClassInfo: [], //培训班开单列表
@@ -19,7 +19,7 @@ export default {
 			autoLoad: true, //自动获取商品信息
 			isLimit: true, //选择数量不能大于库存限制
 
-			//成品开单
+			//商品开单
 			suit_scroll_into_view:"",
 			suit_top_list:'',
 			suitTimeFun:"",
@@ -50,7 +50,7 @@ export default {
 				if(!this.$util.isEmpty(this.tabIndex)){
 					this.initData();//组合
 				}
-				// this.initGoodsData();//成品
+				// this.initGoodsData();//商品
 				// this.initPxClassData();//课程
 			}
 		}
@@ -419,7 +419,7 @@ export default {
 			return price;
 		},
 		/**
-			* 成品-请求商品数据
+			* 商品-请求商品数据
 			*/
 		async initGoodsData(extendInfo) {
 			//extendInfo调用时的扩展参数  如  shopId
@@ -448,7 +448,7 @@ export default {
 			}
 		},
 		/**
-			* 成品-滚动或切换分类 获取更多数据
+			* 商品-滚动或切换分类 获取更多数据
 			* **/
 		suitScrollPushList(){
 			let list = copyObject(this.suitInfo);
@@ -914,7 +914,7 @@ export default {
 		},
 
 		/**
-			* 成品（多风格）-切换左侧商品类别
+			* 商品（多风格）-切换左侧商品类别
 			*/
 		suitSwichClass(cur) {
 

hdApp/src/mixins/ghsProduct.js

@@ -6,8 +6,8 @@ export default {
 		return {
 			pageType: "bill", //选择商品页面类别  用于区分不同功能的数据
 
-			suitInfo: [], //成品-商品信息
-			suitClassIndex: 0, //成品-当前商品类别下标
+			suitInfo: [], //商品-商品信息
+			suitClassIndex: 0, //商品-当前商品类别下标
 
 			productInfo: [], //商品信息
 			pxClassInfo: [], //培训班开单列表
@@ -24,7 +24,7 @@ export default {
 			this.pageType = pageType;
 		}
 		if (this.autoLoad) {
-			this.initGoodsData();//成品
+			this.initGoodsData();//商品
 			this.initData();//组合
 			this.initPxClassData();//课程
 		}
@@ -235,7 +235,7 @@ export default {
 			return price;
 		},
 		/**
-			* 成品-请求商品数据
+			* 商品-请求商品数据
 			*/
 		async initGoodsData(extendInfo) {
 			//extendInfo调用时的扩展参数  如  shopId

hdApp/src/pages.json

@@ -205,7 +205,7 @@
 				{ "path": "freight", "style": { "navigationBarTitleText": "运费设置" } },
 				{ "path": "price-increase", "style": { "navigationBarTitleText": "节日自动涨价" } },
 				{ "path": "plant", "style": { "navigationBarTitleText": "盆栽绿植资材" } },
-				{ "path": "flower", "style": { "navigationBarTitleText": "鲜花成品" } },
+				{ "path": "flower", "style": { "navigationBarTitleText": "鲜花商品" } },
 				{ "path": "flowerConfirm", "style": { "navigationBarTitleText": "确认" } },
 				{ "path": "flowerResult", "style": { "navigationBarTitleText": "结果" } },
 				{ "path": "plantConfirm", "style": { "navigationBarTitleText": "确认采购" } },
@@ -213,7 +213,7 @@
 				{ "path": "cgNewPlant", "style": { "navigationBarTitleText": "新采购" } },
 				{ "path": "cgNewPlantResult", "style": { "navigationBarTitleText": "采购成功" } },
 				{ "path": "stockChange", "style": { "navigationBarTitleText": "库存变动记录" } },
-				{ "path": "plantCg", "style": { "navigationBarTitleText": "成品采购单" } },
+				{ "path": "plantCg", "style": { "navigationBarTitleText": "商品采购单" } },
 				{ "path": "plantCgDetail", "style": { "navigationBarTitleText": "明细" } }
 			]
 		},

hdApp/src/pagesOrder/select.vue

@@ -140,7 +140,7 @@ export default {
 					name: "花材"
 				},
 				{
-					name: "成品"
+					name: "商品"
 				}
 				// {
 				//     name: '课程'

hdApp/src/pagesPurchase/cosNext.vue

@@ -226,7 +226,7 @@ export default {
         return { productId: ele.id, bigNum: ele.bigCount, smallNum: ele.smallCount };
       });
       let options = {
-        orderType: 2,// 开单类型，1成品开单 2花材开单
+        orderType: 2,// 开单类型，1商品开单 2花材开单
         packingFee: this.packingMoney,// 包装费
         sendCost: this.freight,// 运费
         customId: this.clientInfo.id,// 客户

hdApp/src/pagesStorehouse/allot/exSelect.vue

@@ -182,7 +182,7 @@ export default {
 					name: "花材"
 				},
 				{
-					name: "成品"
+					name: "商品"
 				}
 				// {
 				//     name: '课程'

hdApp/src/pagesStorehouse/inventory/select.vue

@@ -143,7 +143,7 @@ export default {
 					name: "花材"
 				},
 				{
-					name: "成品"
+					name: "商品"
 				}
 				// {
 				//     name: '课程'