合并im

components/m-buy/goods.vue

@@ -71,7 +71,7 @@
 							<!-- 正常逻辑 循环出sku -->
 							<view
 								v-if="!parentOrder"
-								:class="{ active: spec_val.value == currentSelceted[specIndex] }"
+								:class="{ active: spec_val.value == currentSelected[specIndex] }"
 								class="skus-view-item"
 								v-for="(spec_val, spec_index) in spec.values"
 								:key="spec_index"
@@ -83,7 +83,7 @@
 							<!-- 拼团购买，仅筛选出当前拼团类型商品 -->
 							<view
 								v-if="parentOrder && spec_val.skuId == goodsDetail.id"
-								:class="{ active: spec_val.value == currentSelceted[specIndex] }"
+								:class="{ active: spec_val.value == currentSelected[specIndex] }"
 								class="skus-view-item"
 								v-for="(spec_val, spec_index) in spec.values"
 								:key="spec_index"
@@ -97,7 +97,7 @@
 					<view class="goods-skus-number flex flex-a-c flex-j-sb">
 						<view class="view-class-title">数量</view>
 
-						<u-input class="view-class-input" input-align="right" v-model="num" type="number" @blur="numCheck()" @change="numChange()" />
+						<u-input class="view-class-input" input-align="right" v-model="num" type="number" @blur="numCheck()" />
 					</view>
 				</scroll-view>
 				<!-- 按钮 -->
@@ -125,7 +125,7 @@ export default {
 			buyType: '', //用于存储促销，拼团等活动类型
 			parentOrder: '', //父级拼团活动的数据 - 如果是团员则有数据
 			formatList: [],
-			currentSelceted: [],
+			currentSelected: [],
 			skuList: '',
 			isClose: false //是否可以点击遮罩关闭
 		};
@@ -182,7 +182,10 @@ export default {
 	},
 	watch: {
 		num(val) {
+			
+			val == 0 ? this.num = 1 : ''
 			if (val) {
+				
 				//超过库存后修改回库存
 				if (val > this.goodsDetail.quantity) {
 					this.$nextTick(function() {
@@ -223,20 +226,15 @@ export default {
 		closeMask() {
 			this.$emit('closeBuy', false);
 		},
-		numChange() {
+		
-			if (this.num > this.goodsDetail.quantity) {
-				alert(1);
-				this.num = this.goodsDetail.quantity;
-			}
-		},
 		/**点击规格 */
 		handleClickSpec(val, index, specValue) {
-			this.currentSelceted[index] = specValue.value;
+			this.currentSelected[index] = specValue.value;
 			let selectedSkuId = this.goodsSpec.find(i => {
 				let matched = true;
 				let specValues = i.specValues.filter(j => j.specName !== 'images');
 				for (let n = 0; n < specValues.length; n++) {
-					if (specValues[n].specValue !== this.currentSelceted[n]) {
+					if (specValues[n].specValue !== this.currentSelected[n]) {
 						matched = false;
 						return;
 					}
@@ -246,7 +244,7 @@ export default {
 				}
 			});
 			if (selectedSkuId?.skuId) {
-				this.$set(this.currentSelceted, index, specValue.value);
+				this.$set(this.currentSelected, index, specValue.value);
 				this.selectSkuList = {
 					spec: {
 						specName: val.name,
@@ -381,7 +379,7 @@ export default {
 					item.specValues
 						.filter(i => i.specName !== 'images')
 						.forEach((value, _index) => {
-							this.currentSelceted[_index] = value.specValue;
+							this.currentSelected[_index] = value.specValue;
 
 							this.selectName = value.specValue;
 

pages/cart/coupon/couponCenter.vue

@@ -25,7 +25,7 @@
 								<!-- 根据scopeType 判断是否是 平台、品类或店铺  -->
 								<view class="coupon-title wes-3" v-if="item.scopeType">
 									<span v-if="item.scopeType == 'ALL' && item.storeId == '0'">全平台</span>
-									<span v-if="item.scopeType == 'PORTION_CATEGORY'">仅限品类</span>
+									<span v-if="item.scopeType == 'PORTION_GOODS_CATEGORY'">仅限品类</span>
 									<view v-else>{{ item.storeName == 'platform' ? '全平台' :item.storeName+'店铺' }}使用
 									</view>
 								</view>

pages/cart/coupon/index.vue

@@ -35,7 +35,7 @@
         <view class="desc">
           <view v-if="item.scopeType">
             <span v-if="item.scopeType == 'ALL' && item.storeId == '0'">全平台</span>
-            <span v-if="item.scopeType == 'PORTION_CATEGORY'">仅限品类</span>
+            <span v-if="item.scopeType == 'PORTION_GOODS_CATEGORY'">仅限品类</span>
             <view v-else
               >{{
                 item.storeName == "platform" ? "全平台" : item.storeName + "店铺"

pages/order/fillorder.vue

@@ -181,14 +181,20 @@
           </u-col>
         </u-row>
       </div>
-      <u-row>
+      <u-row v-if="orderMessage.priceDetailDTO.goodsPrice != 0 && orderMessage.priceDetailDTO.goodsPrice != null">
         <u-col :offset="0" :span="9" @click="GET_Discount()">优惠券</u-col>
-
+        <u-col
-        <u-col :span="3" v-if="
+          :span="3"
+          v-if="
             orderMessage.priceDetailDTO &&
             orderMessage.priceDetailDTO.couponPrice
-        " textAlign="right" @click="GET_Discount()">
+          "
-          <span class="main-color">-￥{{ orderMessage.priceDetailDTO.couponPrice | unitPrice }}</span>
+          textAlign="right"
+          @click="GET_Discount()"
+        >
+          <span class="main-color"
+            >-￥{{ orderMessage.priceDetailDTO.couponPrice | unitPrice }}</span
+          >
         </u-col>
         <!--  orderMessage.priceDetailDTO.couponPrice | unitPrice  -->
         <u-col :span="3" v-else textAlign="right" @click="GET_Discount()">

pages/product/goods.vue

@@ -283,6 +283,7 @@ import popupAddress from "./product/popup/address"; //地址选择模块
 import shares from "@/components/m-share/index"; //分享
 import popups from "@/components/popups/popups"; //气泡框
 import setup from "./product/popup/popup";
+
 export default {
   components: {
     popups,
@@ -600,17 +601,23 @@ export default {
 
     linkMsgDetail () {
       // lili 基础客服
+<<<<<<< HEAD
 
       uni.navigateTo({
         url: `/pages/mine/im/index?userId=${this.goodsDetail.storeId}&goodsid=${this.routerVal.goodsId}&skuid=${this.routerVal.id}`
       });
 
+=======
+      this.$options.filters.talkIm(this.storeDetail.storeId)
+  
+>>>>>>> f84f9ab696c10447c7aa8a27382cfccd3d5729d8
       // udesk 代码  
       // if (this.storeDetail.merchantEuid) {
       //   uni.navigateTo({
       //     url: `/pages/tabbar/home/web-view?src=${this.IM}`,
       //   });
       // }
+<<<<<<< HEAD
 
 
       // 客服 云智服代码 
@@ -642,6 +649,39 @@ export default {
       // });
       // // #endif
 
+=======
+		  
+		  
+        // 客服 云智服代码 
+        // // #ifdef MP-WEIXIN
+        // const params = {
+        //   storeName: this.storeDetail.storeName,
+        //   goodsName: this.goodsDetail.goodsName,
+        //   goodsId: this.goodsDetail.goodsId,
+        //   goodsImg: this.goodsDetail.thumbnail,
+        //   price: this.goodsDetail.promotionPrice || this.goodsDetail.price,
+        //   // originalPrice: this.goodsDetail.original || this.goodsDetail.price,
+        //   uuid: storage.getUuid(),
+        //   token: storage.getAccessToken(),
+        //   sign: this.storeDetail.yzfSign,
+        //   mpSign: this.storeDetail.yzfMpSign,
+        // };
+        // uni.navigateTo({
+        //   url:
+        //     "/pages/product/customerservice/index?params=" +
+        //     encodeURIComponent(JSON.stringify(params)),
+        // });
+        // // #endif
+        // // #ifndef MP-WEIXIN
+        // const sign = this.storeDetail.yzfSign;
+        // uni.navigateTo({
+        //   url:
+        //     "/pages/tabbar/home/web-view?src=https://yzf.qq.com/xv/web/static/chat/index.html?sign=" +
+        //     sign,
+        // });
+        // // #endif
+    
+>>>>>>> f84f9ab696c10447c7aa8a27382cfccd3d5729d8
     },
     /**选择商品 */
     changedGoods (val) {

pages/product/product/promotion/-promotion-coupon.vue

@@ -12,7 +12,7 @@
 						<div class="coupon-List-title">
 							<view v-if="item.scopeType">
 								<span v-if="item.scopeType == 'ALL' && item.storeId == '0'">全平台</span>
-								<span v-if="item.scopeType == 'PORTION_CATEGORY'">仅限品类</span>
+								<span v-if="item.scopeType == 'PORTION_GOODS_CATEGORY'">仅限品类</span>
 								<view v-else>{{
                          item.storeName == "platform" ? "全平台" : item.storeName + "店铺"
                        }}使用</view>

pages/product/shopPage.vue

@@ -49,7 +49,7 @@
         </div>
 
         <!-- 联系客服 -->
-        <div class="kefu" @click="linkKefuDetail">
+        <div class="kefu" @click="talk">
           <u-icon name="kefu-ermai"></u-icon>
           联系客服
         </div>
@@ -79,6 +79,34 @@
           </view>
         </view>
       </scroll-view>
+
+      <!-- 基础店铺模式 -->
+      <div v-if="basePageData">
+        <u-tabs :list="tabs" :active-color="mainColor" :is-scroll="false" :current="current" @change="changeTab"></u-tabs>
+        <div class="content" v-if="current == 0">
+          <u-empty style='margin-top:100rpx' v-if="goodsList.length == 0" class="empty" text='暂无商品信息'></u-empty>
+          <goodsTemplate v-else :res="goodsList" :storeName="false" />
+        </div>
+        <!-- 全部分类 -->
+        <div class="category" v-if="current == 1">
+          <div class="category-item" v-for="(item,index) in categoryList" :key="index">
+            <div class="flex" @click="getCategoryGoodsList(item)">
+              <div>{{item.labelName}}</div>
+              <div>
+                <u-icon color="#999" name="arrow-right"></u-icon>
+              </div>
+            </div>
+            <!-- 分类子级 -->
+            <div class="child-list" v-if="item.children && item.children.length!=0">
+              <div class="child" @click="getCategoryGoodsList(child)" :key='i' v-for="(child,i) in item.children">{{child.labelName}}
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <!-- 楼层装修模式 -->
+      <div v-if="enablePageData">
         <!-- uni 中不能使用 vue component 所以用if判断每个组件 -->
         <div v-for="(item, index) in pageData.list" :key="index">
           <!-- 搜索栏，如果在楼层装修顶部则会自动浮动，否则不浮动 -->
@@ -124,6 +152,7 @@
           <!-- <integral v-if="item.type == 'integral'" :res="item.options" /> -->
           <!-- <spike v-if="item.type == 'spike'" :res="item.options" /> -->
         </div>
+      </div>
       <u-no-network></u-no-network>
     </div>
   </view>
@@ -147,7 +176,7 @@ import tpl_menu from "@/pages/tabbar/home/template/tpl_menu"; //五列菜单模
 import tpl_search from "@/pages/tabbar/home/template/tpl_search"; //搜索栏
 import tpl_group from "@/pages/tabbar/home/template/tpl_group"; //
 import tpl_goods from "@/pages/tabbar/home/template/tpl_goods"; //商品分类以及分类中的商品
-
+import goodsTemplate from '@/components/m-goods-list/list'
 import { getStoreBaseInfo, getStoreCategory } from "@/api/store.js";
 import {
   receiveCoupons,
@@ -156,7 +185,7 @@ import {
   getGoodsIsCollect,
 } from "@/api/members.js";
 import config from "@/config/config";
-import storage from "@/utils/storage";
+
 import { getGoodsList } from "@/api/goods.js";
 import { getAllCoupons } from "@/api/promotions.js";
 import { getFloorStoreData } from "@/api/home"; //获取楼层装修接口
@@ -192,7 +221,7 @@ export default {
       },
       goodsParams: {
         pageNumber: 1,
-        pageSize: 50,
+        pageSize: 10,
         storeId: "",
       },
     };
@@ -214,6 +243,7 @@ export default {
     flexOne: tpl_flex_one,
     goods: tpl_goods,
     group: tpl_group,
+    goodsTemplate
     // spike: tpl_spike,
     // joinGroup: tpl_join_group,
     // integral: tpl_integral,
@@ -262,6 +292,9 @@ export default {
   },
 
   methods: {
+    talk(){
+      this.$options.filters.talkIm(this.storeInfo.storeId)
+    },
     back() {
       uni.navigateBack();
     },
@@ -298,6 +331,7 @@ export default {
       // 店铺信息
       this.getStoreData();
     },
+<<<<<<< HEAD
     /**
      * 联系客服
      */
@@ -331,6 +365,8 @@ export default {
       // });
       // #endif
     },
+=======
+>>>>>>> f84f9ab696c10447c7aa8a27382cfccd3d5729d8
 
     /** 获取店铺分类 */
     async getCategoryData() {
@@ -375,16 +411,21 @@ export default {
       let res = await getStoreBaseInfo(this.storeId);
       if (res.data.success) {
         this.storeInfo = res.data.result;
-
-        // 开启了楼层装修店铺
-        this.initPageData();
-        // 未开启楼层装修店铺
-        // 商品信息
-        this.getGoodsData();
         // 优惠券信息
         this.getCouponsData();
+        if(res.data.result.pageShow == '1'){
+          // 开启了楼层装修店铺
+          this.initPageData();
+          this.enablePageData = true;
+        }
+        else{
+          // 商品信息
+          this.getGoodsData();
           // 店铺分类
           this.getCategoryData();
+          
+          this.basePageData = true;
+        }
       } else {
         uni.reLaunch({
           url: "/",

utils/filters.js

@@ -281,6 +281,19 @@ export function isLogin(val) {
     return storage.getUserInfo();
   }
 }
+/**
+ * 跳转im
+ */ 
+export function talkIm(storeId){
+  if(isLogin('auth')){
+    uni.navigateTo({
+      url: `/pages/tabbar/home/web-view?IM=${storeId}`,
+    });
+  }
+  else{
+    tipsToLogin()
+  }
+}
 
 export function tipsToLogin() {
   if (!isLogin("auth")) {