Skip to content

M
mayi-mp-shop
Commit 1650e52f by 李嘉林
Options

Merge branch 'nativehome_tst' of http://code.mayi888.com/chengmo/mayi-mp-shop into nativehome_tst

parents 43889e92 548132d0
Showing with 634 additions and 278 deletions
config/dev.env.js
...@@ -17,7 +17,7 @@ module.exports = merge(prodEnv, {//zjgyl ...@@ -17,7 +17,7 @@ module.exports = merge(prodEnv, {//zjgyl
// BASE_URL:"'http://192.168.1.146:3005'", // BASE_URL:"'http://192.168.1.146:3005'",
// BASE_URL:"'http://192.168.1.127:3000'", // BASE_URL:"'http://192.168.1.127:3000'",
BASE_URL:"'https://test-m-shop.mayi888.cn'", BASE_URL:"'https://test-m-shop.mayi888.cn'",
// BASE_URL:"'http://172.16.1.48:3004'", // BASE_URL:"'http://192.168.137.1:3004'",
OLSHOP_URL:'"https://test-m-shop.mayi888.cn/innerApi/shopApiService"', OLSHOP_URL:'"https://test-m-shop.mayi888.cn/innerApi/shopApiService"',
// OLSHOP_URL:'"https://shop.mayi888.com/innerApi/shopApiService"', // OLSHOP_URL:'"https://shop.mayi888.com/innerApi/shopApiService"',
......
custom-tab-bar/index.wxss
@font-face {font-family: "iconfont";
src: url('//at.alicdn.com/t/font_1457682_3rf83d24buy.eot?t=1604541583326'); /* IE9 */
src: url('//at.alicdn.com/t/font_1457682_3rf83d24buy.eot?t=1604541583326#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
url('//at.alicdn.com/t/font_1457682_3rf83d24buy.woff?t=1604541583326') format('woff'),
url('//at.alicdn.com/t/font_1457682_3rf83d24buy.ttf?t=1604541583326') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
url('//at.alicdn.com/t/font_1457682_3rf83d24buy.svg?t=1604541583326#iconfont') format('svg'); /* iOS 4.1- */
}
.iconfont {
font-family: "iconfont" !important;
font-size: 16px;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.icon-tuceng1:before {
content: "\e692";
}
.icon-tuceng2:before {
content: "\e706";
}
.icon-fenzhi:before {
content: "\e629";
}
.icon-tuceng:before {
content: "\e621";
}
.icon-mokuai:before {
content: "\e604";
}
.icon-fengge:before {
content: "\e607";
}
.icon-iconfontquestion:before {
content: "\e60b";
}
.icon-bianji:before {
content: "\e637";
}
.icon-shezhi:before {
content: "\e781";
}
.icon-lui-dot:before {
content: "\e66";
}
.icon-Notvisible:before {
content: "\e6fe";
}
.icon-browse:before {
content: "\e745";
}
.icon-qingkong1:before {
content: "\e624";
}
.icon-zhongxin:before {
content: "\e68b";
}
.icon-tianjia:before {
content: "\e602";
}
.icon-shangchuantupian11:before {
content: "\c652";
}
.icon-daoru1:before {
content: "\e63b";
}
.icon-theme-fenxiang:before {
content: "\e610";
}
.icon-tuijian:before {
content: "\e63f";
}
.icon-huodong:before {
content: "\e606";
}
.icon-huodong1:before {
content: "\e61f";
}
.icon-tuijian1:before {
content: "\e620";
}
.icon-wode:before {
content: "\e603";
}
.icon-gouwuche:before {
content: "\e605";
}
.icon-fenlei1:before {
content: "\e649";
}
.icon-home:before {
content: "\e64b";
}
.icon-in_gouxuan:before {
content: "\e601";
}
.icon-jiahao:before {
content: "\e61c";
}
.icon-tupian2:before {
content: "\e636";
}
.icon-gonggao:before {
content: "\e611";
}
.icon-dazhuanpan:before {
content: "\e616";
}
.icon-duoxingwenben:before {
content: "\e7e1";
}
.icon-xianshiqianggou:before {
content: "\e633";
}
.icon-icon-test:before {
content: "\e61d";
}
.icon-liebiao:before {
content: "\e627";
}
.icon-article:before {
content: "\e7e7";
}
.icon-fengexian:before {
content: "\e66e";
}
.icon-lunboxiaoguo:before {
content: "\e675";
}
.icon-youhuiquan:before {
content: "\e697";
}
.icon-zixun:before {
content: "\e66c";
}
.icon-lianjie:before {
content: "\e623";
}
.icon-guanggaolianmeng:before {
content: "\e7dd";
}
.icon-fabu:before {
content: "\e600";
}
.icon-pintu:before {
content: "\e61e";
}
.icon-fanhui:before {
content: "\e60a";
}
.icon-shanchuguanbicha:before {
content: "\e809";
}
.icon-shanchu1:before {
content: "\e6d0";
}
.icon-shanchu:before {
content: "\e609";
}
.icon-iconset0308:before {
content: "\e6cf";
}
@font-face { @font-face {
font-family: "ant"; font-family: "ant";
......
project.config.json
...@@ -41,17 +41,10 @@ ...@@ -41,17 +41,10 @@
"simulatorPluginLibVersion": {}, "simulatorPluginLibVersion": {},
"libVersion": "2.15.0", "libVersion": "2.15.0",
"condition": { "condition": {
"search": {
"list": []
},
"conversation": {
"list": []
},
"plugin": { "plugin": {
"list": [] "list": []
}, },
"game": { "game": {
"currentL": -1,
"list": [] "list": []
}, },
"gamePlugin": { "gamePlugin": {
...@@ -79,6 +72,23 @@ ...@@ -79,6 +72,23 @@
"pathName": "pages/index/main", "pathName": "pages/index/main",
"query": "scene=pid_6141", "query": "scene=pid_6141",
"scene": 1047 "scene": 1047
},
{
"name": "pages/tabBar1/main",
"pathName": "pages/tabBar1/main",
"query": "",
"scene": null
},
{
"name": "pages/tabBar4/main",
"pathName": "pages/tabBar4/main",
"query": "",
"scene": null
},
{
"name": "pages/home/main",
"pathName": "pages/home/main",
"scene": null
} }
] ]
} }
......
src/App.vue
...@@ -11,10 +11,12 @@ export default { ...@@ -11,10 +11,12 @@ export default {
process.env.NODE_ENV == "development" || process.env.NODE_ENV == "development" ||
JSON.stringify(extConfig) == "{}" JSON.stringify(extConfig) == "{}"
) { ) {
// extConfig = { mixid: "jordan", shopid: 471 };
extConfig = { mixid: "antgood", shopid: 67 }; extConfig = { mixid: "antgood", shopid: 67 };
} }
console.log("1444444444", extConfig.mixid); console.log("1444444444", extConfig.mixid);
this.$store.commit("setExtConfig", extConfig.mixid); this.$store.commit("setExtConfig", extConfig.mixid);
this.$store.commit('setExtConfigInfo',extConfig)
// 调用API从本地缓存中获取数据 // 调用API从本地缓存中获取数据
/* /*
* 平台 api 差异的处理方式: api 方法统一挂载到 mpvue 名称空间, 平台判断通过 mpvuePlatform 特征字符串 * 平台 api 差异的处理方式: api 方法统一挂载到 mpvue 名称空间, 平台判断通过 mpvuePlatform 特征字符串
......
src/api/index.js
...@@ -22,5 +22,8 @@ console.log(process.env,'-----------------config------') ...@@ -22,5 +22,8 @@ console.log(process.env,'-----------------config------')
get_product_category(data) { get_product_category(data) {
return requestPOST(`${process.env.OLSHOP_URL}/product/get_product_category`, data); return requestPOST(`${process.env.OLSHOP_URL}/product/get_product_category`, data);
}, },
getLiveCon(data){
return requestPOST(`${process.env.OLSHOP_URL}/liveBroadcastInfo/getPageListByIds`, data);
}
} }
\ No newline at end of file
src/app.json
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
"pages/tabBar1/main", "pages/tabBar1/main",
"pages/tabBar2/main", "pages/tabBar2/main",
"pages/tabBar3/main", "pages/tabBar3/main",
"pages/tabBar4/main",
"pages/changeAdr/main" "pages/changeAdr/main"
], ],
"tabBar": { "tabBar": {
...@@ -31,6 +32,9 @@ ...@@ -31,6 +32,9 @@
}, },
{ {
"pagePath": "pages/tabBar3/main" "pagePath": "pages/tabBar3/main"
},
{
"pagePath": "pages/tabBar4/main"
} }
] ]
}, },
......
src/pages/home/index.vue
...@@ -68,6 +68,11 @@ ...@@ -68,6 +68,11 @@
</div> </div>
<div v-if="item.componentCode == 'transverse-label' && item.componentInfo.visible == 1"> <div v-if="item.componentCode == 'transverse-label' && item.componentInfo.visible == 1">
<transverse-label :datas="item" :componentIndex="index"></transverse-label> <transverse-label :datas="item" :componentIndex="index"></transverse-label>
<div v-if="item.componentCode == 'photo-gallery' && item.componentInfo.visible == 1">
<photo-gallery :datas="item"></photo-gallery>
</div>
<div v-if="item.componentCode == 'live-broadcast' && item.componentInfo.visible == 1">
<live-broadcast :datas="item"></live-broadcast>
</div> </div>
</div> </div>
...@@ -169,6 +174,7 @@ export default { ...@@ -169,6 +174,7 @@ export default {
// }; // };
}, },
onLoad(options) { onLoad(options) {
let location=JSON.parse(wx.getStorageSync('location') || '{}') let location=JSON.parse(wx.getStorageSync('location') || '{}')
// if (!location.areaGroupId) { // if (!location.areaGroupId) {
// wx.redirectTo({ // wx.redirectTo({
...@@ -178,16 +184,19 @@ export default { ...@@ -178,16 +184,19 @@ export default {
this.changeLocation = options.changeLocation || '' this.changeLocation = options.changeLocation || ''
if(this.changeLocation == 1){ if(this.changeLocation == 1){
let extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}; // let extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {};
console.log(extConfig, "-----------extConfig"); // console.log(extConfig, "-----------extConfig");
if ( // if (
process.env.NODE_ENV == "development" || // process.env.NODE_ENV == "development" ||
JSON.stringify(extConfig) == "{}" // JSON.stringify(extConfig) == "{}"
) { // ) {
extConfig = { mixid: "antgood", shopid: 67 }; // extConfig = { mixid: "antgood", shopid: 67 };
} // }
app.getShopInfo(extConfig);
app.getThemePage(extConfig); console.log('this.$store.state.extConfig',this.$store.state.extConfig)
app.getShopInfo(this.$store.state.extConfig);
app.getThemePage(this.$store.state.extConfig);
} }
let that = this; let that = this;
// 来源 // 来源
...@@ -216,6 +225,7 @@ export default { ...@@ -216,6 +225,7 @@ export default {
}else { }else {
this.mpApp.themeColorCallBack=(res)=>{ this.mpApp.themeColorCallBack=(res)=>{
this.themeColor = res this.themeColor = res
} }
} }
...@@ -227,28 +237,6 @@ export default { ...@@ -227,28 +237,6 @@ export default {
this.$mp.page.onPageScroll= (el)=>{ this.$mp.page.onPageScroll= (el)=>{
this.scrolls(el); this.scrolls(el);
}; };
let extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {};
console.log(extConfig, "-----------extConfig");
if (
process.env.NODE_ENV == "development" ||
JSON.stringify(extConfig) == "{}"
) {
extConfig = { mixid: "antgood", shopid: 67 };
}
// console.log(wx.getStorageSync('changeAdr'),'changeAdr')
// if(wx.getStorageSync('changeAdr') == 'changeAdr'){
// Object.assign(this.$data, this.$options.data());
// app.getShopInfo(extConfig);
// // 页面配置信息
// app.getThemePage(extConfig);
// wx.removeStorageSync('changeAdr')
// }
// 获取购物车数量
this.getCartNum();
}, },
methods: { methods: {
init(pageList) { init(pageList) {
...@@ -259,6 +247,10 @@ export default { ...@@ -259,6 +247,10 @@ export default {
this.pageData = JSON.parse(this.pageInfo.pageData); this.pageData = JSON.parse(this.pageInfo.pageData);
console.log("36", this.pageData); console.log("36", this.pageData);
console.log(app.globalData.shopInfo,'app')
wx.setNavigationBarTitle({title : app.globalData.shopInfo.shopName})
wx.stopPullDownRefresh() wx.stopPullDownRefresh()
}, },
scrolls(el){ scrolls(el){
...@@ -295,17 +287,9 @@ export default { ...@@ -295,17 +287,9 @@ export default {
} }
}, },
onPullDownRefresh(){ onPullDownRefresh(){
let extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}; console.log('onPullDownRefresh',this.$store.state.extConfig)
console.log(extConfig, "-----------extConfig"); app.getShopInfo(this.$store.state.extConfig);
if ( app.getThemePage(this.$store.state.extConfig);
process.env.NODE_ENV == "development" ||
JSON.stringify(extConfig) == "{}"
) {
extConfig = { mixid: "antgood", shopid: 67 };
}
console.log('onPullDownRefresh')
app.getShopInfo(extConfig);
app.getThemePage(extConfig);
} }
......
src/pages/home/main.json
...@@ -15,7 +15,10 @@ ...@@ -15,7 +15,10 @@
"pop-up":"/static/nativeComponents/PopUp/index", "pop-up":"/static/nativeComponents/PopUp/index",
"share-popup":"/static/nativeComponents/SharePopup/index", "share-popup":"/static/nativeComponents/SharePopup/index",
"speedy-nav":"/static/nativeComponents/SpeedyNav/index", "speedy-nav":"/static/nativeComponents/SpeedyNav/index",
"video-player":"/static/nativeComponents/VideoPlayer/index" "video-player":"/static/nativeComponents/VideoPlayer/index",
"photo-gallery":"/static/nativeComponents/PhotoGallery/index",
"live-broadcast":"/static/nativeComponents/LiveBroadcast/index"
}, },
"enablePullDownRefresh":true "enablePullDownRefresh":true,
"backgroundColor":"#f5f5f5"
} }
\ No newline at end of file
src/store/mutations.js
...@@ -35,6 +35,9 @@ const mutations = { ...@@ -35,6 +35,9 @@ const mutations = {
}, },
setExtConfig(state,obj){ setExtConfig(state,obj){
state.mixid = obj state.mixid = obj
},
setExtConfigInfo(state,obj){
state.extConfig = obj
} }
}; };
......
src/store/state.js
...@@ -22,5 +22,6 @@ const state = { ...@@ -22,5 +22,6 @@ const state = {
userInfo, userInfo,
mixid : '', mixid : '',
extConfig : {}
}; };
export default state export default state
\ No newline at end of file
src/utils/mayi.js
import cart from "@/api/cart" import cart from "@/api/cart"
// 登录白名单 name
export const noLoginList = ["index", "media-video", "goods-goodsInfo", "goods-commodityMenu", "goodsSearch-goodsSearch", "chooseStores", "activty-receivingGift", "activty", "login-register", "login-phoneLogin", "login-authInformation", "login-forgetPassWord", "login-accountLogin", "login-wxRegister", "pay-payList", "comment-evaluateList", "goods-commonProblemList", "article-articlePage", "article-articleList", "goods-posters", "liveBroadcast", "liveBroadcast-list", "personalCenter-coupon-getCoupon", "buyerShow-showDetail", "goods-addGoodsList", "personalCenter-CDkey-exchange", "giftCards-linkReceive", "giftCoupon-preview", "smartForm", "shopCart-shareShopCart", "groupBuying-beInvite", "brandTopics", 'personalCenter-spokesmanCenter', 'personalCenter-spokesmanCenter-mine-spokesmanHomePage','liveBroadcast-lived', 'personalCenter-spokesmanCenter-mine-getBusinessCard','changeAdr'];
// path
export const noLoginListPath = noLoginList.map(item=>{
item=item.replace(/-/g,'/')
item='/'+item
item=="/index" && (item="/")
return item
})
// 主题色 // 主题色
export let themeColor = { export let themeColor = {
"--main-color": "#ffffff", "--main-color": "#ffffff",
...@@ -19,13 +30,21 @@ export function $themeToLink(data, option) { ...@@ -19,13 +30,21 @@ export function $themeToLink(data, option) {
// 点击底部栏 // 点击底部栏
if (option) { if (option) {
let parseLink = getUrlofLink(data); let parseLink = getUrlofLink(data);
let isTabbarIndex = checkTabbarPage(parseLink); let aa=noLoginListPath.includes(parseLink) || parseLink.substr(0,7)=="/goods/"
console.log(parseLink,aa,'parseLinkparseLinkparseLink',parseLink,noLoginListPath)
if (!aa && !wx.getStorageSync("sessionid")) {
let url = `/pages/login/main?back=${parseLink}`;
wx.navigateTo({url});
return
}
// 替换首页位置 // 替换首页位置
let isTabbarIndex = checkTabbarPage(parseLink);
isTabbarIndex = isTabbarIndex == 0 ? checkTabbarPage('/') : isTabbarIndex isTabbarIndex = isTabbarIndex == 0 ? checkTabbarPage('/') : isTabbarIndex
wx.switchTab({ wx.switchTab({
url: parseLink == '/' ? '/pages/home/main' : `/pages/tabBar${isTabbarIndex}/main`, url: parseLink == '/' ? '/pages/home/main' : `/pages/tabBar${isTabbarIndex}/main`,
}) })
console.log(option, data) console.log(option, data,'---',parseLink == '/' ? '/pages/home/main' : `/pages/tabBar${isTabbarIndex}/main`)
return return
} }
...@@ -37,18 +56,6 @@ export function $themeToLink(data, option) { ...@@ -37,18 +56,6 @@ export function $themeToLink(data, option) {
} }
return return
} }
// 底部导航跳转
// let parseLink=getUrlofLink(data)
// let isTabbarIndex =checkTabbarPage(parseLink )
// if (isTabbarIndex>-1) {
// wx.switchTab({
// url: parseLink == '/' ? '/pages/home/main' : `/pages/tabBar${isTabbarIndex}/main`,
// })
// return
// }
// ----------------- // -----------------
if (type == 0) {//无链接 if (type == 0) {//无链接
return return
......
static/nativeComponents/LiveBroadcast/index.js 0 → 100644
// static/nativeComponents/LiveBroadcast/index.js
let app = getApp()
const { indexApi } = app
Component({
/**
* 组件的属性列表
*/
properties: {
datas: {
type: Object
}
},
/**
* 组件的初始数据
*/
data: {
showNum : 0,
showList : true,
},
ready(){
if (this.data.datas.componentData.liveList.length >= this.data.datas.componentData.showNum) {
this.setData({
showNum: this.data.datas.componentData.showNum
})
} else {
this.setData({
showNum: this.data.datas.componentData.liveList.length
})
}
this.init()
console.log('datas.componentData.style', this.data.datas.componentData.liveList)
},
/**
* 组件的方法列表
*/
methods: {
init(){
this.setData({
'datas.componentData.liveList' : []
})
console.log(this.data.datas.componentData.liveList, 'this.data.datas.componentData.liveList')
indexApi.getLiveCon(this.data.datas.componentData.liveIdList).then(res => {
if(res.data.code == '200'){
if(res.data.data.length == 0){
this.setData({
showList : false,
'datas.componentData.liveList' : [],
'datas.componentData.liveIdList':[]
})
}else{
res.data.data.forEach(item => {
item.coverUrl = app.DFSImg(item.coverUrl);
item.anchorHeadImages = app.DFSImg(item.anchorHeadImages);
item.watchNum = item.watchNum ? (Number(item.watchNum) > 10000 ?( Number(item.watchNum)/10000).toFixed(1) + 'w' : item.watchNum ) : 0
})
this.setData({
'datas.componentData.liveList' : res.data.data
})
}
console.log(this.data.datas.componentData.liveList,'this.data.datas.componentData.liveList')
}else{
this.setData({
showList : false
})
}
})
},
toList(){
app.$themeToLink({
type: 1,
link: '/liveBroadcast/list'
})
},
toLiveDetail(e){
let id = e.currentTarget.dataset.itemid
app.$themeToLink({
type: 1,
link: '/liveBroadcast/lived?liveId=' + id
})
}
}
})
static/nativeComponents/LiveBroadcast/index.json 0 → 100644
{
"component": true,
"usingComponents": {}
}
\ No newline at end of file
static/nativeComponents/LiveBroadcast/index.wxml 0 → 100644
<!--static/nativeComponents/LiveBroadcast/index.wxml-->
<view class="live-broadcast" wx:if="{{showList}}">
<view class="top flex">
<view style="font-weight:bold;font-size:36rpx">直播</view>
<view class="seeMore" bindtap="toList">查看更多</view>
</view>
<view class="liveList" wx:if="{{datas.componentData.liveList.length>0}}" style="padding:{{datas.componentData.style==1 ? '0px' : ''}}">
<view wx:if="{{datas.componentData.style==1}}">
<view class="live live3" wx:for="{{showNum}}" wx:key="index" bindtap="toLiveDetail" data-itemid="{{datas.componentData.liveList[index].id}}">
<view class="img">
<image class="cover-img" src="{{datas.componentData.liveList[index].coverUrl}}" mode="aspectFill">
</image>
<view class="live-info">
<view class="isLive" style="background-color:{{ datas.componentData.liveList[index].liveBroadcastState == 2 ? '#000000' :'#ff3300'}}">
<i class="dot"></i>
<view wx:if="{{datas.componentData.liveList[index].liveBroadcastState == 0}}">预告</view>
<view wx:if="{{datas.componentData.liveList[index].liveBroadcastState == 1}}">直播中</view>
<view wx:if="{{datas.componentData.liveList[index].liveBroadcastState == 2}}">已结束</view>
<view wx:if="{{datas.componentData.liveList[index].liveBroadcastState == 3}}">暂停直播</view>
<view wx:if="{{datas.componentData.liveList[index].liveBroadcastState == 4}}">直播超时</view>
</view>
<view class="live-title">{{datas.componentData.liveList[index].title}}</view>
</view>
<image class="common-iconbofang" src="http://mayi-newshop.oss-cn-shanghai.aliyuncs.com/public/png/3784cd9c-d7e5-4db5-a800-f6e5ca43bb44.png"></image>
</view>
<view class="user-info" wx:if="{{datas.componentData.liveInfoShow}}">
<view class="avator">
<image src="{{datas.componentData.liveList[index].anchorHeadImages}}"></image>
</view>
<view class="name">{{datas.componentData.liveList[index].anchorName}}</view>
</view>
</view>
</view>
<view wx:if="{{datas.componentData.style==2}}">
<view class="live live1" wx:for="{{showNum}}" wx:key="index" bindtap="toLiveDetail" data-itemid="{{datas.componentData.liveList[index].id}}">
<view class="title line-clamp1">{{datas.componentData.liveList[index].title}}</view>
<view class="img">
<image class="cover-img" src="{{datas.componentData.liveList[index].coverUrl}}" mode="aspectFill">
</image>
<view class="isLive" style="background-color:{{ datas.componentData.liveList[index].liveBroadcastState == 2 ? '#000000' :'#ff3300'}}">
<i class="dot"></i>
<view wx:if="{{datas.componentData.liveList[index].liveBroadcastState == 0}}">预告</view>
<view wx:if="{{datas.componentData.liveList[index].liveBroadcastState == 1}}">直播中</view>
<view wx:if="{{datas.componentData.liveList[index].liveBroadcastState == 2}}">已结束</view>
<view wx:if="{{datas.componentData.liveList[index].liveBroadcastState == 3}}">暂停直播</view>
<view wx:if="{{datas.componentData.liveList[index].liveBroadcastState == 4}}">直播超时</view>
</view>
<view class="watch-num">{{datas.componentData.liveList[index].watchNum ?datas.componentData.liveList[index].watchNum : 0 }}次观看</view>
<image class="common-iconbofang" src="http://mayi-newshop.oss-cn-shanghai.aliyuncs.com/public/png/3784cd9c-d7e5-4db5-a800-f6e5ca43bb44.png"></image>
</view>
<view class="user-info" wx:if="{{datas.componentData.liveInfoShow}}">
<view class="avator">
<image src="{{datas.componentData.liveList[index].anchorHeadImages}}"></image>
</view>
<view class="name">{{datas.componentData.liveList[index].anchorName}}</view>
</view>
</view>
</view>
<view wx:if="{{datas.componentData.style==3}}">
<view class="live live2" style="padding:{{datas.componentData.liveInfoShow ? '0 9px 10px':''}}" wx:for="{{showNum}}" wx:key="index" bindtap="toLiveDetail" data-itemid="{{datas.componentData.liveList[index].id}}">
<view class="user-info" wx:if="{{datas.componentData.liveInfoShow}}">
<view class="avator">
<image src="{{datas.componentData.liveList[index].anchorHeadImages}}"></image>
</view>
<view class="name">{{datas.componentData.liveList[index].anchorName}}</view>
</view>
<view class="live-detail">
<view class="img">
<image class="cover-img" mode="aspectFill" src="{{datas.componentData.liveList[index].coverUrl}}"></image>
<view class="isLive" style="background-color:{{datas.componentData.liveList[index].liveBroadcastState == 2 ? '#000000' :'#ff3300'}}">
<view class="dot"></view>
<view wx:if="{{datas.componentData.liveList[index].liveBroadcastState == 0}}">预告</view>
<view wx:if="{{datas.componentData.liveList[index].liveBroadcastState == 1}}">直播中</view>
<view wx:if="{{datas.componentData.liveList[index].liveBroadcastState == 2}}">已结束</view>
<view wx:if="{{datas.componentData.liveList[index].liveBroadcastState == 3}}">暂停直播</view>
<view wx:if="{{datas.componentData.liveList[index].liveBroadcastState == 4}}">直播超时</view>
</view>
<image class="common-iconbofang" src="http://mayi-newshop.oss-cn-shanghai.aliyuncs.com/public/png/3784cd9c-d7e5-4db5-a800-f6e5ca43bb44.png"></image>
</view>
<view class="info">
<view class="title line-clamp1">{{datas.componentData.liveList[index].title}}</view>
<view class="time"></view>
</view>
</view>
</view>
</view>
</view>
</view>
\ No newline at end of file
static/nativeComponents/LiveBroadcast/index.wxss 0 → 100644
/* static/nativeComponents/LiveBroadcast/index.wxss */
.top{
display: flex;
justify-content: space-between;
align-items: center;
font-size: 32rpx;
height: 80rpx;
padding: 0 40rpx;
background-color: white;
color: #333;
}
.seeMore{
font-size: 28rpx;
color: var(--main-color);
}
.liveList{
width: 100%;
padding: 20rpx 28rpx;
box-sizing: border-box;
}
.liveList .live{
width: 100%;
border-radius: 8rpx;
overflow: hidden;
margin-top: 28rpx;
background-color: white
}
.liveList .live .img{
width: 100%;
}
.liveList .live .img .cover-img{
width: 100%;
}
.liveList .common-iconbofang{
position: absolute;
width: 80rpx;
height: 80rpx;
top: 50%;
left: 50%;
margin-left: -40rpx;
margin-top: -40rpx;
color: rgba(0,0,0,.8);
opacity: 1;
transition: all .5s;
}
.liveList .live .user-info{
display: flex;
justify-content: flex-start;
align-items: center;
height: 84rpx;
}
.liveList .live .user-info .avator{
width: 56rpx;
height: 56rpx;
border-radius: 50%;
background-color: #999;
overflow: hidden;
}
.liveList .live .user-info .avator image{
width: 100%;
height: 100%;
}
.liveList .live .user-info .name{
font-size: 26rpx;
color: #333333;
margin-left: 12rpx;
}
.live3{
position: relative;
box-sizing: border-box;
border-radius: 0;
}
.live3:first-child{
margin-top: 0;
}
.live3 .img{
width: 100%;
height: 422rpx;
overflow: hidden;
position: relative;
}
.live3 .img .cover-img{
width: 100%;
height: 100%;
}
.live3 .img .live-info{
position: absolute;
left: 24rpx;
top: 16rpx;
display: flex;
justify-content: flex-start;
align-items: center;
}
.live3 .img .live-info .isLive{
color: #fff;
font-size: 24rpx;
border-radius: 4rpx;
width: 120rpx;
height: 40rpx;
display: flex;
text-align: center;
line-height: 40rpx;
align-items: center;
justify-content: center;
}
.live3 .img .live-info .isLive .dot{
width: 12rpx;
height:12rpx;
background: #fff;
border-radius: 50%;
margin-right: 8rpx;
}
.live3 .img .live-info .live-title{
font-size: 32rpx;
color: white;
margin-left:8rpx;
text-shadow: 4rpx 4rpx 4rpx #999;
}
.live3 .user-info{
padding-left: 24rpx;
}
.live1{
position: relative;
box-sizing: border-box;
padding:12rpx 24rpx 4rpx;
}
.live1 .title{
color: #333;
font-size: 30rpx;
line-height: 60rpx;
}
.live1 .img{
width: 100%;
height: 362rpx;
border-radius: 4rpx;
overflow: hidden;
position: relative;
}
.live1 .img .cover-img{
width: 100%;
height: 100%;
}
.live1 .img .isLive{
color: #fff;
font-size:24rpx;
border-radius: 4rpx;
width: 120rpx;
height: 40rpx;
display: flex;
text-align: center;
line-height: 40rpx;
align-items: center;
justify-content: center;
position: absolute;
left: 16rpx;
bottom: 16rpx;
}
.live1 .img .isLive .dot{
width: 12rpx;
height: 12rpx;
background: #fff;
border-radius: 50%;
margin-right: 8rpx;
}
.live1 .img .watch-num{
position: absolute;
right: 16rpx;
bottom: 16rpx;
font-size: 26rpx;
color: #FFFDFD;
}
.live2{
box-sizing: border-box;
}
.live2 .live-detail{
display: flex;
}
.live2 .live-detail .img{
width: 40%;
height: 20vh;
position: relative;
}
.live-detail .img .cover-img{
width: 100%;
height: 100%;
}
.live-detail .img .isLive{
color: #fff;
font-size: 24rpx;
border-radius: 4rpx;
width: 120rpx;
height: 40rpx;
display: flex;
text-align: center;
line-height: 40rpx;
align-items: center;
justify-content: center;
position: absolute;
left: 10rpx;
bottom: 10rpx;
}
.live-detail .img .isLive .dot {
width: 12rpx;
height: 12rpx;
background: #fff;
border-radius: 50%;
margin-right: 8rpx;
}
.live-detail .info{
width: 60%;
padding: 0 30rpx;
}
.live-detail .info .title{
line-height: 60rpx;
}
.line-clamp1 {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
\ No newline at end of file
static/nativeComponents/PhotoGallery/index.js 0 → 100644
// static/nativeComponents/PhotoGallery/index.js
let app = getApp()
Component({
/**
* 组件的属性列表
*/
properties: {
datas: {
type: Object
}
},
/**
* 组件的初始数据
*/
data: {
getPaddingList: [{
'name': '上',
'value': 0
},
{
'name': '下',
'value': 0
},
{
'name': '左',
'value': 0
},
{
'name': '右',
'value': 0
}
],
},
ready(){
console.log(this.data.datas.componentData.paddingList,'this.data.datas.componentData.paddingList')
if (this.data.datas.componentData.paddingList){
this.setData({
getPaddingList: this.data.datas.componentData.paddingList
})
}
},
/**
* 组件的方法列表
*/
methods: {
}
})
static/nativeComponents/PhotoGallery/index.json 0 → 100644
{
"component": true,
"usingComponents": {}
}
\ No newline at end of file
static/nativeComponents/PhotoGallery/index.wxml 0 → 100644
<!--static/nativeComponents/PhotoGallery/index.wxml-->
<view class="photo-gallery" style="padding-top:{{getPaddingList[0]['value'] * 2}}rpx;padding-bottom:{{getPaddingList[1]['value'] * 2}}rpx;padding-left:{{getPaddingList[2]['value'] * 2}}rpx;padding-right:{{getPaddingList[3]['value'] * 2}}rpx">
<view wx:if="{{datas.componentData.titles!=''}}" style="font-size:{{datas.componentData.titleSize}}em;padding-bottom:{{datas.componentData.titlePadding * 2}}rpx" class="textH">
{{datas.componentData.titles}}
</view>
<view wx:if="{{datas.componentData.style==='list'}}">
<view class="imgcontent" wx:for="{{datas.componentData.imgList}}" wx:key="{{index}}" style="margin-bottom:{{datas.componentData.imgPadding * 2}}rpx">
<image src="{{item.imageUrl}}" lazy-load></image>
</view>
</view>
<view wx:elif="{{datas.componentData.style==='across' || datas.componentData.style==='tiled'}}" class="across">
<view class="prev-btn" wx:if="{{datas.componentData.style==='across'}}">
<i class="iconfont-common common-iconyoujiantou"></i>
</view>
<view class="next-btn" wx:if="datas.componentData.style==='across'">
<i class="iconfont-common common-iconyoujiantou"></i>
</view>
<view style="display:{{datas.componentData.style==='tiled' ? 'flex' : ''}}" class="ul">
<view wx:for="{{datas.componentData.imgList}}" wx:key="{{index}}" style="margin-right:{{index===(datas.componentData.imgList.length-1)? '' : datas.componentData.imgPadding * 2 + 'rpx'}};width:{{datas.componentData.style==='across' ? datas.componentData.acrossPer+'%' : ''}}" class="li">
<image src="{{item.imageUrl}}" lazy-load mode="widthFix"></image>
</view>
</view>
</view>
</view>
static/nativeComponents/PhotoGallery/index.wxss 0 → 100644
/* static/nativeComponents/PhotoGallery/index.wxss */
@import "/static/font/common_icon.wxss";
.photo-gallery{
width: 100%;
font-size: 32rpx;
box-sizing: border-box;
}
.textH{
text-align: center;
font-weight: bold;
}
.imgcontent{
width: 100%;
text-align: center;
}
.imgcontent image{
width: 100%;
display: block;
}
.across {
position: relative;
}
.ul{
overflow-x: auto;
white-space: nowrap;
width: 100%;
}
.ul .li{
display: inline-block;
flex: 1
}
.ul .li image{
width: 100%;
vertical-align: middle;
}
.prev-btn,.next-btn{
width: 60rpx;
height: 60rpx;
position: absolute;
top: 50%;
margin-top: -30rpx;
z-index: 99;
opacity: .3;
}
.prev-btn i,.next-btn i {
font-size: 60rpx;
}
.next-btn{
right:10rpx;
}
.prev-btn{
left:10rpx;
-webkit-transform: rotate(180deg);
transform: rotate(180deg)
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment