zhuce
/
lilishop-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并im

master
chc 2023-01-09 18:53:29 +08:00
parent 0da7dc6796 f84f9ab696
commit 7ff13babaa
8 changed files with 180 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
components/m-buy/goods.vue
View File

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

2
pages/cart/coupon/couponCenter.vue
View File

@ -25,7 +25,7 @@
<!-- 根据scopeType 判断是否是 平台、品类或店铺 --> <!-- 根据scopeType 判断是否是 平台、品类或店铺 -->
<view class="coupon-title wes-3" v-if="item.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 == '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 v-else>{{ item.storeName == 'platform' ? '全平台' :item.storeName+'店铺' }}使用
</view> </view>
</view> </view>

2
pages/cart/coupon/index.vue
View File

@ -35,7 +35,7 @@
<view class="desc"> <view class="desc">
<view v-if="item.scopeType"> <view v-if="item.scopeType">
<span v-if="item.scopeType == 'ALL' && item.storeId == '0'">全平台</span> <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 <view v-else
>{{ >{{
item.storeName == "platform" ? "全平台" : item.storeName + "店铺" item.storeName == "platform" ? "全平台" : item.storeName + "店铺"

20
pages/order/fillorder.vue
View File

@ -181,14 +181,20 @@
</u-col> </u-col>
</u-row> </u-row>
</div> </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 :offset="0" :span="9" @click="GET_Discount()">优惠券</u-col>
<u-col
<u-col :span="3" v-if=" :span="3"
orderMessage.priceDetailDTO && v-if="
orderMessage.priceDetailDTO.couponPrice orderMessage.priceDetailDTO &&
" textAlign="right" @click="GET_Discount()"> orderMessage.priceDetailDTO.couponPrice
<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> </u-col>
<!-- orderMessage.priceDetailDTO.couponPrice | unitPrice --> <!-- orderMessage.priceDetailDTO.couponPrice | unitPrice -->
<u-col :span="3" v-else textAlign="right" @click="GET_Discount()"> <u-col :span="3" v-else textAlign="right" @click="GET_Discount()">

40
pages/product/goods.vue
View File

@ -283,6 +283,7 @@ import popupAddress from "./product/popup/address"; //地址选择模块
import shares from "@/components/m-share/index"; //分享 import shares from "@/components/m-share/index"; //分享
import popups from "@/components/popups/popups"; //气泡框 import popups from "@/components/popups/popups"; //气泡框
import setup from "./product/popup/popup"; import setup from "./product/popup/popup";
export default { export default {
components: { components: {
popups, popups,
@ -600,17 +601,23 @@ export default {
linkMsgDetail () { linkMsgDetail () {
// lili 基础客服 // lili 基础客服
<<<<<<< HEAD
uni.navigateTo({ uni.navigateTo({
url: `/pages/mine/im/index?userId=${this.goodsDetail.storeId}&goodsid=${this.routerVal.goodsId}&skuid=${this.routerVal.id}` 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 代码 // udesk 代码
// if (this.storeDetail.merchantEuid) { // if (this.storeDetail.merchantEuid) {
// uni.navigateTo({ // uni.navigateTo({
// url: `/pages/tabbar/home/web-view?src=${this.IM}`, // url: `/pages/tabbar/home/web-view?src=${this.IM}`,
// }); // });
// } // }
<<<<<<< HEAD
// 客服 云智服代码 // 客服 云智服代码
@ -642,6 +649,39 @@ export default {
// }); // });
// // #endif // // #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) { changedGoods (val) {

2
pages/product/product/promotion/-promotion-coupon.vue
View File

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

147
pages/product/shopPage.vue
View File

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

13
utils/filters.js
View File

@ -281,6 +281,19 @@ export function isLogin(val) {
return storage.getUserInfo(); 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() { export function tipsToLogin() {
if (!isLogin("auth")) { if (!isLogin("auth")) {