Ver Fonte

commit -m 报备

zhengjinyi há 2 anos atrás
pai
commit
8c4f1dfc48

+ 7 - 7
pages/seller/club/club-info.vue

@@ -69,14 +69,14 @@
 				</view>
 				<view class="info-main">
 					<view class="info-h1">其他信息</view>
-					<view class="info-p" v-if="clubInfo.contractPhone"
-						>固定电话:<text>{{ clubInfo.contractPhone }}</text></view
+					<view class="info-p"
+						>固定电话:<text>{{ clubInfo.contractPhone ? clubInfo.contractPhone : '无' }}</text></view
 					>
-					<view class="info-p" v-if="clubInfo.fax"
-						>传真:<text>{{ clubInfo.fax }}</text></view
+					<view class="info-p"
+						>传真:<text>{{ clubInfo.fax ? clubInfo.fax : '无' }}</text></view
 					>
-					<view class="info-p" v-if="clubInfo.profile"
-						>公司介绍:<text>{{ clubInfo.profile }}</text></view
+					<view class="info-p"
+						>公司介绍:<text>{{ clubInfo.profile ? clubInfo.profile : '无' }}</text></view
 					>
 				</view>
 			</view>
@@ -248,7 +248,7 @@ page {
 					background-color: #e15616;
 					position: absolute;
 					left: 0;
-					top: 22rpx;
+					top: 30rpx;
 				}
 			}
 			.info-p {

+ 0 - 0
components/cm-module/cm-seller/category.vue → pages/seller/components/category.vue


+ 0 - 0
components/cm-module/cm-seller/cm-clubmodal.vue → pages/seller/components/cm-clubmodal.vue


+ 0 - 0
components/cm-module/cm-seller/cm-clubpopup.vue → pages/seller/components/cm-clubpopup.vue


+ 0 - 0
components/cm-module/cm-seller/cm-goods-popup.vue → pages/seller/components/cm-goods-popup.vue


+ 0 - 0
components/cm-module/cm-seller/cm-refereepopup.vue → pages/seller/components/cm-refereepopup.vue


+ 0 - 0
components/cm-module/cm-seller/cm-report-popup.vue → pages/seller/components/cm-report-popup.vue


+ 0 - 0
components/cm-module/cm-seller/cm-screen-drawer.vue → pages/seller/components/cm-screen-drawer.vue


+ 0 - 0
components/cm-module/cm-seller/home.vue → pages/seller/components/home.vue


+ 0 - 0
components/cm-module/cm-seller/user.vue → pages/seller/components/user.vue


+ 3 - 3
pages/seller/index/index.vue

@@ -27,9 +27,9 @@
 </template>
 
 <script>
-	import sellerHome from '@/components/cm-module/cm-seller/home.vue'
-	import sellerUser from '@/components/cm-module/cm-seller/user.vue'
-	import sellerCategory from '@/components/cm-module/cm-seller/category.vue'
+	import sellerHome from '../components/home.vue'
+	import sellerUser from '../components/user.vue'
+	import sellerCategory from '../components/category.vue'
 	export default {
 		components: {
 			sellerHome,//采美采购商城 0

+ 8 - 4
pages/seller/remarks/add-record.vue

@@ -239,8 +239,8 @@
 import { mapState, mapMutations } from 'vuex'
 import authorize from '@/common/config/authorize.js'
 import { uploadFileImage, uploadFilePdfDocDocxXlsx } from '@/services/public.js'
-import cmGoodspopup from '@/components/cm-module/cm-seller/cm-goods-popup'
-import cmReportpopup from '@/components/cm-module/cm-seller/cm-report-popup'
+import cmGoodspopup from '../components/cm-goods-popup'
+import cmReportpopup from '../components/cm-report-popup'
 
 var isPreviewImg
 export default {
@@ -302,6 +302,7 @@ export default {
 			assActionList: [],
 			isGoodspopup:false,
 			isReportpopup:false,
+			isHashReport: false,
 			handleGoods: [],
 			reportInfo:{
 				questionMan:'',
@@ -356,7 +357,10 @@ export default {
 				this.remarksParams.imageList = data.imageList
 				this.remarksParams.consult = data.consult
 				this.remarksParams.productId = data.productId
-				this.remarksParams.reportId = data.reportId
+				if(data.reportId){
+					this.isHashReport = true
+					this.remarksParams.reportId = data.reportId
+				}
 				this.checkedCategorysList = data.consult.split(',').map(i => parseInt(i, 0))
 				this.categorys = this.categorys.map((el, index) => {
 					if(data.consult.includes(el.id)){
@@ -516,7 +520,7 @@ export default {
 		},
 		handleShowReportPopup(){
 			// 显示报备弹窗
-			if (this.remarksParams.reportId) {
+			if (this.isHashReport) {
 				this.$util.msg('请取消已有关联后再重新关联报备', 2000)
 				return
 			}

+ 8 - 4
pages/seller/remarks/add.vue

@@ -264,8 +264,8 @@
 import { mapState, mapMutations } from 'vuex'
 import authorize from '@/common/config/authorize.js'
 import { uploadFileImage, uploadFilePdfDocDocxXlsx } from '@/services/public.js'
-import cmGoodspopup from '@/components/cm-module/cm-seller/cm-goods-popup'
-import cmReportpopup from '@/components/cm-module/cm-seller/cm-report-popup'
+import cmGoodspopup from '../components/cm-goods-popup'
+import cmReportpopup from '../components/cm-report-popup'
 
 var isPreviewImg
 export default {
@@ -332,6 +332,7 @@ export default {
 			assActionList: [],
 			isGoodspopup: false,
 			isReportpopup: false,
+			isHashReport:false,
 			handleGoods: [],
 			reportInfo: {
 				clubId: 0,
@@ -393,8 +394,11 @@ export default {
 					this.remarksParams.fileList = data.fileList
 					this.remarksParams.imageList = data.imageList
 					this.remarksParams.productId = data.productId
-					this.remarksParams.reportId = data.reportId
 					if (this.handleType == 'edit') {
+						if(data.reportId){
+							this.isHashReport = true
+							this.remarksParams.reportId = data.reportId
+						}
 						this.remarksParams.questionMan = data.questionMan
 						this.remarksParams.consult = data.consult
 						this.checkedCategorysList = data.consult.split(',').map(i => parseInt(i, 0))
@@ -566,7 +570,7 @@ export default {
 		},
 		handleShowReportPopup() {
 			// 显示报备弹窗
-			if (this.remarksParams.reportId) {
+			if (this.isHashReport) {
 				this.$util.msg('请取消已有关联后再重新关联报备', 2000)
 				return
 			}

+ 1 - 1
pages/seller/remarks/customer-list.vue

@@ -68,7 +68,7 @@
 	</view>
 </template>
 <script>
-import cmClubpopup from '@/components/cm-module/cm-seller/cm-clubpopup'
+import cmClubpopup from '../components/cm-clubpopup'
 
 import { mapState, mapMutations } from 'vuex'
 const defaultListQuery = {

+ 2 - 2
pages/seller/remarks/list.vue

@@ -163,8 +163,8 @@
 	</view>
 </template>
 <script>
-import cmClubpopup from '@/components/cm-module/cm-seller/cm-clubpopup'
-import cmScreenDrawer from '@/components/cm-module/cm-seller/cm-screen-drawer'
+import cmClubpopup from '../components/cm-clubpopup'
+import cmScreenDrawer from '../components/cm-screen-drawer'
 
 import { mapState, mapMutations } from 'vuex'
 const defaultListQuery = {

+ 3 - 3
pages/seller/remarks/record-list.vue

@@ -166,9 +166,9 @@
 </template>
 <script>
 import { mapState, mapMutations } from 'vuex'
-import cmRefereepopup from '@/components/cm-module/cm-seller/cm-refereepopup'
-import cmClubmodal from '@/components/cm-module/cm-seller/cm-clubmodal'
-import cmScreenDrawer from '@/components/cm-module/cm-seller/cm-screen-drawer'
+import cmRefereepopup from '../components/cm-refereepopup'
+import cmClubmodal from '../components/cm-clubmodal'
+import cmScreenDrawer from '../components/cm-screen-drawer'
 
 const defaultListQuery = {
 	startAddTime:'',

+ 2 - 2
pages/seller/remarks/relation-consult-list.vue

@@ -128,8 +128,8 @@
 	</view>
 </template>
 <script>
-import cmClubpopup from '@/components/cm-module/cm-seller/cm-clubpopup'
-import cmScreenDrawer from '@/components/cm-module/cm-seller/cm-screen-drawer'
+import cmClubpopup from '../components/cm-clubpopup'
+import cmScreenDrawer from '../components/cm-screen-drawer'
 
 import { mapState, mapMutations } from 'vuex'
 const defaultListQuery = {

+ 2 - 2
pages/seller/remarks/relation-visitor-list.vue

@@ -127,8 +127,8 @@
 	</view>
 </template>
 <script>
-import cmClubpopup from '@/components/cm-module/cm-seller/cm-clubpopup'
-import cmScreenDrawer from '@/components/cm-module/cm-seller/cm-screen-drawer'
+import cmClubpopup from '../components/cm-clubpopup'
+import cmScreenDrawer from '../components/cm-screen-drawer'
 
 import { mapState, mapMutations } from 'vuex'
 const defaultListQuery = {

+ 1 - 1
pages/seller/remarks/report-add.vue

@@ -89,7 +89,7 @@
 <script>
 import { mapState, mapMutations } from 'vuex'
 import authorize from '@/common/config/authorize.js'
-import cmGoodspopup from '@/components/cm-module/cm-seller/cm-goods-popup'
+import cmGoodspopup from '../components/cm-goods-popup'
 
 export default {
 	components: {

+ 1 - 1
pages/seller/remarks/report-details.vue

@@ -31,7 +31,7 @@
 			<view class="list-view-title">
 				<view class="list-view-h1">报备时间:{{ reportParams.addTime }}</view>
 			</view>
-			<view class="list-view-title"> <view class="list-view-h1">报备商品:</view> </view>
+			<view class="list-view-title" v-if="reportParams.productId"> <view class="list-view-h1">报备商品:</view> </view>
 			<view class="tui-remarks-content" v-if="reportParams.productId">
 				<view class="tui-remarks-goods">
 					<view class="goods-image"> <image :src="reportParams.mainImage" mode=""></image> </view>

+ 3 - 3
pages/seller/remarks/report-list.vue

@@ -109,9 +109,9 @@
 </template>
 <script>
 import { mapState, mapMutations } from 'vuex'
-import cmRefereepopup from '@/components/cm-module/cm-seller/cm-refereepopup'
-import cmClubmodal from '@/components/cm-module/cm-seller/cm-clubmodal'
-import cmScreenDrawer from '@/components/cm-module/cm-seller/cm-screen-drawer'
+import cmRefereepopup from '../components/cm-refereepopup'
+import cmClubmodal from '../components/cm-clubmodal'
+import cmScreenDrawer from '../components/cm-screen-drawer'
 
 const defaultListQuery = {
 	keyWord:'',

+ 0 - 0
components/cm-module/supplier/banner.vue → pages/supplier/components/banner.vue


+ 0 - 0
components/cm-module/supplier/category.vue → pages/supplier/components/category.vue


+ 0 - 0
components/cm-module/supplier/home.vue → pages/supplier/components/home.vue


+ 0 - 0
components/cm-module/supplier/notice.vue → pages/supplier/components/notice.vue


+ 0 - 0
components/cm-module/supplier/supplierDetails.vue → pages/supplier/components/supplierDetails.vue


+ 0 - 0
components/cm-module/supplier/user.vue → pages/supplier/components/user.vue


+ 4 - 4
pages/supplier/index/index.vue

@@ -37,10 +37,10 @@
 </template>
 
 <script>
-import supplierHome from '@/components/cm-module/supplier/home.vue'
-import supplierUser from '@/components/cm-module/supplier/user.vue'
-import supplierNotice from '@/components/cm-module/supplier/notice.vue'
-import supplierCategory from '@/components/cm-module/supplier/category.vue'
+import supplierHome from '../components/home.vue'
+import supplierUser from '../components/user.vue'
+import supplierNotice from '../components/notice.vue'
+import supplierCategory from '../components/category.vue'
 export default {
 	components: {
 		supplierHome, //采美采购商城 0

+ 1 - 1
pages/supplier/user/my-shop.vue

@@ -413,7 +413,7 @@
 <script>
 import { mapState, mapMutations } from 'vuex'
 import custom from './components/custom.vue' //自定义导航
-import banner from '@/components/cm-module/supplier/banner.vue'
+import banner from '../components/banner.vue'
 import uniGrader from '@/components/uni-grade/uni-grade.vue'
 import authorize from '@/common/config/authorize.js'
 import wxLogin from '@/common/config/wxLogin.js'

+ 1 - 1
pages/supplier/user/supplier.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script>
-	import supplierDetails from "@/components/cm-module/supplier/supplierDetails.vue" //供应商详情
+	import supplierDetails from "../components/supplierDetails.vue" //供应商详情
 	export default{
 		components:{
 			supplierDetails

+ 2 - 2
services/config.env.js

@@ -4,8 +4,8 @@ if(process.env.NODE_ENV === 'development'){
     // URL_CONFIG = 'http://192.168.2.67:18002'	 //智捷联调地址
     // URL_CONFIG = 'http://192.168.2.68:18002'	 //涛涛联调地址
     // URL_CONFIG = 'http://192.168.2.180:18002' //超超联调地址
-    // URL_CONFIG = 'https://core-b.caimei365.com'
-    URL_CONFIG = 'https://core.caimei365.com'
+    URL_CONFIG = 'https://core-b.caimei365.com'
+    // URL_CONFIG = 'https://core.caimei365.com'
 }else{
     // 生产环境
     // URL_CONFIG = 'https://core-b.caimei365.com'