花材的产品

ghsApp/src/admin/cp/components/cpItem.vue

@@ -4,14 +4,14 @@
 
         <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/cp/item?cpId='+info.id})">
+		<view class="img_bx" @click="doIt(info)">
 			<view v-if="info.status == 2" class="sold-out">
 				<view class="sold-out-xj">已下架</view>
 			</view>
 			<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/cp/item?cpId='+info.id})">
+		<view class="cmd-info_bx active" @click="doIt(info)">
 			<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>
@@ -55,6 +55,10 @@ export default {
 	props: {
 		info: {
 			required: true
+		},
+		skipType:{
+			type: Number,
+			default:0
 		}
 	},
 	data() {
@@ -68,6 +72,9 @@ export default {
 		}
 	},
 	methods: {
+		doIt(info){
+			this.$emit("doIt",info)
+		},
 		hideChangeFn(item,status){
 			this.$emit("hideChangeFn",item,status)
 		},

ghsApp/src/admin/cp/list.vue

@@ -28,11 +28,11 @@
                             <view v-if="!$util.isEmpty(globalCpList)">
                                 <template v-for="(productItem, productIndex) in globalCpList">
                                     <view style="height:255upx" :key="productIndex">
-                                        <ItemStock :info="productItem" @moreAction="moreAction" 
+                                        <cpStock :info="productItem" @moreAction="moreAction" @doIt="doIt"
                                         @doPrintLabel="doPrintLabel" @cancelDiscountFn="cancelDiscountFn" @cancelFullOff="cancelFullOff"
                                         :ref="`productRef${productItem.id}`" @hideChangeFn="hideChangeFn" 
                                         @cancelPreSellFn="cancelPreSellFn" @breakSingleItem="breakSingleItem">
-                                        </ItemStock>
+                                        </cpStock>
                                     </view>
                                 </template>
                             </view>
@@ -93,7 +93,7 @@
   <script>
   import AppSearchModule from "@/components/module/app-search";
   import AppWrapperEmpty from "@/components/app-wrapper-empty";
-  import ItemStock from "./components/cpItem";
+  import cpStock from "./components/cpItem";
   import cpMins from "@/mixins/cp";
   import { mapGetters } from "vuex";
   import { getWeixinId } from "@/api/invite";
@@ -107,36 +107,37 @@
       components: {
           AppSearchModule,
           AppWrapperEmpty,
-          ItemStock,
+          cpStock,
           uniPopup,
           ModalModule
       },
       mixins: [cpMins],
       data() {
           return {
-              autoLoad: false,
-              selectJobType: "stock",
-              tabIndex: 0,
-              getAppIdList:{},
-              status:0,
-              delStatus:0,
-              printItemId:0,
-              printType:0,
-              printLabelShow:false,
-              printNum:'',
-              printFocus:false,
-              warning:0,
-              currentInfo:{},
-              posterUrl:'',
-              breakNum:'',
-              breakFocus:false,
-              breakShow:false,
-              classIndex: 0,
-              globalCpClassList:[],
-                globalCpList:[],
-                page:1,
-                currentClassId:0,
-                finishGetCp:0
+            autoLoad: false,
+            selectJobType: "stock",
+            tabIndex: 0,
+            getAppIdList:{},
+            status:0,
+            delStatus:0,
+            printItemId:0,
+            printType:0,
+            printLabelShow:false,
+            printNum:'',
+            printFocus:false,
+            warning:0,
+            currentInfo:{},
+            posterUrl:'',
+            breakNum:'',
+            breakFocus:false,
+            breakShow:false,
+            classIndex: 0,
+            globalCpClassList:[],
+            globalCpList:[],
+            page:1,
+            currentClassId:0,
+            finishGetCp:0,
+            skip:0
           };
       },
       computed:{
@@ -144,12 +145,11 @@
           ...mapGetters({ loginInfo: "getLoginInfo",dictInfo:"getDictionariesInfo" })
       },
       onLoad() {
-
         let that = this
+        that.skip = that.option.skip ? that.option.skip : 0
         getWeixinId().then(res => {
             that.getAppIdList = res.data
         })
-
         getCpClassMenu().then(res=>{
             if(res.code == 1){
                 that.globalCpClassList = res.data.list ? res.data.list : []
@@ -162,6 +162,19 @@
         })
       },
       methods: {
+        doIt(info){
+            if(this.skip == 0){
+                this.$util.pageTo({url: '/admin/cp/item?cpId='+info.id})
+            } 
+            if(this.skip == 1){
+                //返回上一页带参数
+                let pages = getCurrentPages();
+                let prevPage = pages[ pages.length - 2 ];
+                //修改上一页data里面的xjData
+                prevPage.$vm.returnCpInfo = {cpId:info.id,cpName:info.name,needUpdate:1}
+                uni.navigateBack()
+            }
+        },
         getCpList(){
             if(this.finishGetCp == 1){
                 return false

ghsApp/src/admin/item/detail.vue

@@ -96,6 +96,17 @@
           </view>
         </tui-list-cell>
 
+        <tui-list-cell class="line-cell" :arrow="true">
+          <view class="tui-title">所属产品</view>
+          <input v-model="form.cpId" name="cpId" type="text" hidden />
+          <view style="color:#CCCCCC;width:450upx;height:45upx;" @click.stop="changeCp()" v-if="form.cpId == 0">
+            请选择产品
+          </view>
+          <view @click.stop="changeCp()" style="width:450upx;height:45upx;" v-else>
+            {{form.cpName}}
+          </view>
+        </tui-list-cell>
+
         <tui-list-cell class="line-cell" :hover="false">
           <div class="tui-title">比例类型</div>
           <radio-group class="tui-input" @change="ratioTypeChange">
@@ -303,6 +314,8 @@ export default {
         smallUnitId:2,
         classId:'',
         className:'',
+        cpId:'',
+        cpName:'',
         price:'',
         skPrice:'',
         hjPrice:'',
@@ -338,7 +351,8 @@ export default {
       printItemId:0,
       printNum:'',
       printLabelShow:false,
-      printFocus:false
+      printFocus:false,
+      backCpInfo:{cpId:0,cpName:'',needUpdate:0}
     };
   },
 	computed:{
@@ -366,8 +380,17 @@ export default {
         this.onShowRefresh = 0
       }
     }
+    if(this.backCpInfo.needUpdate == 1){
+      this.backCpInfo.needUpdate = 0
+      this.form.cpId = this.backCpInfo.cpId
+      this.form.cpName = this.backCpInfo.cpName
+      this.$forceUpdate()
+    }
   },
   methods: {
+    changeCp(item){
+      this.$util.pageTo({url: '/admin/cp/list?skip=1'})
+    },
     changeClass(item){
       this.$refs.classRef.open('center')
     },
@@ -502,7 +525,7 @@ export default {
       this.printNum = null
 
 			setTimeout(x => {
-				this.$nextTick(() => this.setFocus()); // just watch out with going too fast !!!
+				this.$nextTick(() => this.setFocus())
 			}, 200);
 		},
 		setFocus() {