Commit 0c88743f by 谢中龙

提交版本

parent da5dd35d
/* component/loading/loading.wxss */ /* component/loading/loading.wxss */
/* pages/laoding/loading.wxss */ /* pages/laoding/loading.wxss */
page{
background: #ffffff;
box-sizing: border-box;
-webkit-box-sizing: border-box;
height: 100vh;
}
view{
box-sizing: border-box;
-webkit-box-sizing: border-box;
}
.loading-container{ .loading-container{
position: fixed; position: fixed;
...@@ -24,6 +14,8 @@ view{ ...@@ -24,6 +14,8 @@ view{
align-items: center; align-items: center;
justify-content: center; justify-content: center;
flex-direction: column; flex-direction: column;
box-sizing: border-box;
-webkit-box-sizing: border-box;
} }
.loading-container .loading-text{ .loading-container .loading-text{
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
// 修改 BRANCH_ID 为对应的商户id // 修改 BRANCH_ID 为对应的商户id
// app.js 中brandId 修改为对应 // app.js 中brandId 修改为对应
const PROJECT_ENV = 'prod' // 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre
//仅生产环境时 配置 : //仅生产环境时 配置 :
//3001 3001 , wx313ec36b710125d4 //3001 3001 , wx313ec36b710125d4
//2006 泰华 , wx40fec8944623c8b3 //2006 泰华 , wx40fec8944623c8b3
...@@ -20,7 +20,7 @@ const PROJECT_ENV = 'prod' // 生产 prod, 开发 dev, 测试 test , 测试门 ...@@ -20,7 +20,7 @@ const PROJECT_ENV = 'prod' // 生产 prod, 开发 dev, 测试 test , 测试门
//2014 包鞋 //2014 包鞋
//2015 花在花园 //2015 花在花园
//2016 阿吉豆 //2016 阿吉豆
const BRANCH_ID = 3001 const BRANCH_ID = 1002
const isMall = true const isMall = true
// const needMock = '' // // const needMock = '' //
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "2.8.2", "libVersion": "2.8.2",
"appid": "wx313ec36b710125d4", "appid": "wxac09792264c49b5c",
"projectname": "%E5%BE%AE%E5%95%86%E5%9F%8E", "projectname": "%E5%BE%AE%E5%95%86%E5%9F%8E",
"debugOptions": { "debugOptions": {
"hidedInDevtools": [] "hidedInDevtools": []
......
...@@ -21,6 +21,10 @@ wxService.page({ ...@@ -21,6 +21,10 @@ wxService.page({
getCollegeInfo(id){ getCollegeInfo(id){
wxService.post(`/merchant/guideCollege/byIdQuery?id=${id}`).then(res => { wxService.post(`/merchant/guideCollege/byIdQuery?id=${id}`).then(res => {
let data = res.data.data; let data = res.data.data;
wx.setNavigationBarTitle({
title: data.title,
});
this.setData({ this.setData({
info : data, info : data,
}); });
......
{ {
"navigationBarTitleText": "导购学院内容详情", "navigationBarTitleText": "加载中..",
"usingComponents": { "usingComponents": {
"x-html": "/component/html2wxml/wxHtml" "x-html": "/component/html2wxml/wxHtml"
} }
......
<!--shoppingGuid/page/pages/guidCollegeInfo/guidCollegeInfo.wxml--> <!--shoppingGuid/page/pages/guidCollegeInfo/guidCollegeInfo.wxml-->
<view class='top-image'> <!-- <view class='top-image'> -->
<!-- top image --> <!-- top image -->
<image src='{{info.titleUrl}}' mode='widthFix'></image> <!-- <image src='{{info.titleUrl}}' mode='widthFix'></image> -->
</view> <!-- </view> -->
<!-- 内容标题 --> <!-- 内容标题 -->
<view class='content-title'>{{info.title}}</view> <!-- <view class='content-title'>{{info.title}}</view> -->
<!-- 富文本内容展示区 --> <!-- 富文本内容展示区 -->
<view class='full-text'> <view class='full-text'>
......
...@@ -33,6 +33,6 @@ view{ ...@@ -33,6 +33,6 @@ view{
} }
.full-text{ .full-text{
padding: 0 30rpx; /* padding: 0 30rpx; */
} }
...@@ -6,7 +6,11 @@ ...@@ -6,7 +6,11 @@
<image src='/assets/imgs/shoppingGuide/kpi_task_time.png' mode='widthFix' /> <image src='/assets/imgs/shoppingGuide/kpi_task_time.png' mode='widthFix' />
<text>{{saleDetail.task.startTime}}~{{saleDetail.task.endTime}}</text> <text>{{saleDetail.task.startTime}}~{{saleDetail.task.endTime}}</text>
</view> </view>
<view class='rg' bindtap='onTapToNotice'>活动说明?</view> <!-- <view class='rg' bindtap='onTapToNotice'>活动说明?</view> -->
<image class="rg"
src="https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/git_button.gif"
mode="aspectFit"
bindtap='onTapToNotice'></image>
</view> </view>
<view class='info-item'> <view class='info-item'>
<view class='lf'> <view class='lf'>
...@@ -14,7 +18,7 @@ ...@@ -14,7 +18,7 @@
<text class='bolder'>{{saleDetail.task.name}}</text> <text class='bolder'>{{saleDetail.task.name}}</text>
</view> </view>
</view> </view>
<view class='info-item'> <view class='info-item' wx:if="{{saleDetail.task.remark}}">
<view class='lf'> <view class='lf'>
<image src='/assets/imgs/shoppingGuide/award.png' mode='widthFix' /> <image src='/assets/imgs/shoppingGuide/award.png' mode='widthFix' />
<text class='bolder'>{{saleDetail.task.remark}}</text> <text class='bolder'>{{saleDetail.task.remark}}</text>
......
...@@ -66,7 +66,7 @@ view{ ...@@ -66,7 +66,7 @@ view{
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
border: solid 2rpx #0091FF; /* border: solid 2rpx #0091FF; */
} }
.task-info-top-container .info-container .info-item .rg:active{ .task-info-top-container .info-container .info-item .rg:active{
......
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