Skip to content

M
mallapp
Commit 23f282bd authored by youjie's avatar youjie
Browse files
Options

修复赞羊

parent acd3595d
Show whitespace changes
Inline Side-by-side
Showing with 112 additions and 113 deletions
manifest.json
View file @ 23f282bd
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
"quickapp" : {}, "quickapp" : {},
/* 小程序特有相关 */ /* 小程序特有相关 */
"mp-weixin" : { "mp-weixin" : {
"appid" : "wxaeb077c07ed6f30d", "appid" : "wxacd9f8cc3480d29e",
"setting" : { "setting" : {
"urlCheck" : false, "urlCheck" : false,
"minified" : false "minified" : false
......
pages.json
View file @ 23f282bd
...@@ -144,113 +144,113 @@ ...@@ -144,113 +144,113 @@
// ] // ]
// }, // },
// { {
// "root": "pages/share", "root": "pages/share",
// "pages": [{ "pages": [{
// "path": "index/index", "path": "index/index",
// "style": { "style": {
// "navigationStyle": "custom" "navigationStyle": "custom"
// } }
// }, },
// { {
// "path": "add/add" "path": "add/add"
// }, },
// { {
// "path": "cash/cash" "path": "cash/cash"
// }, },
// { {
// "path": "level/level" "path": "level/level"
// }, },
// { {
// "path": "level/level_t" "path": "level/level_t"
// }, },
// { {
// "path": "examine" "path": "examine"
// }, },
// { {
// "path": "buyVip/index" "path": "buyVip/index"
// }, },
// { {
// "path": "vipBuyCommission/vipBuyCommission" "path": "vipBuyCommission/vipBuyCommission"
// }, },
// { {
// "path": "buyRecord/index" "path": "buyRecord/index"
// }, },
// { {
// "path": "buyInterest/index" "path": "buyInterest/index"
// }, },
// { {
// "path": "salesvolume", //销售额 "path": "salesvolume", //销售额
// "style": { "style": {
// "navigationStyle": "custom" "navigationStyle": "custom"
// } }
// }, },
// { {
// "path": "time/choiceDate" //时间选择 "path": "time/choiceDate" //时间选择
// } }
// ] ]
// }, },
// { {
// "root": "pages/share-team", "root": "pages/share-team",
// "pages": [{ "pages": [{
// "path": "share-team" "path": "share-team"
// }, { }, {
// "path": "share-detail", "path": "share-detail",
// "style": { "style": {
// "navigationStyle": "custom" "navigationStyle": "custom"
// } }
// }] }]
// }, },
// { {
// "root": "pages/share-order", "root": "pages/share-order",
// "pages": [{ "pages": [{
// "path": "share-order" "path": "share-order"
// }] }]
// }, },
// { {
// "root": "pages/share-qrcode", "root": "pages/share-qrcode",
// "pages": [{ "pages": [{
// "path": "share-qrcode" "path": "share-qrcode"
// }, { }, {
// "path": "share-select-school" "path": "share-select-school"
// }] }]
// }, },
// { {
// "root": "pages/share-money", "root": "pages/share-money",
// "pages": [{ "pages": [{
// "path": "share-money" "path": "share-money"
// }] }]
// }, },
// { {
// "root": "pages/coupon", "root": "pages/coupon",
// "pages": [{ "pages": [{
// "path": "list/list" "path": "list/list"
// }, },
// { {
// "path": "details/details" "path": "details/details"
// }, },
// { {
// "path": "index/index" "path": "index/index"
// }, },
// { {
// "path": "cards/list" //储蓄卡列表 "path": "cards/list" //储蓄卡列表
// }, },
// { {
// "path": "cards/carddetailed" //卡片明细 "path": "cards/carddetailed" //卡片明细
// }, { }, {
// "path": "cards/cardsreceive", //储蓄卡的领取 "path": "cards/cardsreceive", //储蓄卡的领取
// "style": { "style": {
// "navigationStyle": "custom" "navigationStyle": "custom"
// } }
// }, },
// { {
// "path": "cards/purchase", //购买储蓄卡 "path": "cards/purchase", //购买储蓄卡
// "style": { "style": {
// "navigationStyle": "custom" "navigationStyle": "custom"
// } }
// } }
// ] ]
// }, },
{ {
"root": "pages/order-submit", "root": "pages/order-submit",
"pages": [{ "pages": [{
......
pages/cart/cart.vue
View file @ 23f282bd
...@@ -9,13 +9,12 @@ ...@@ -9,13 +9,12 @@
"> ">
<Text class="grid-text" v-if='IsEducation!=1'>商品库存有限，请尽快下单哦</Text> <Text class="grid-text" v-if='IsEducation!=1'>商品库存有限，请尽快下单哦</Text>
<Text class="grid-text" <Text class="grid-text"
v-if='IsEducation==1'>共{{list[0].GoodsList.length?list[0].GoodsList.length:'0'}}个课程</Text> v-if='IsEducation==1'>共{{list[0]&&list[0].GoodsList&&list[0].GoodsList.length?list[0].GoodsList.length:'0'}}个课程</Text>
<Text @click="edit" v-if="editType == false && list[0].GoodsList.length>0" class="grid-text_r">编辑</Text> <Text @click="edit" v-if="editType == false && list[0]&&list[0].GoodsList&&list[0].GoodsList.length>0" class="grid-text_r">编辑</Text>
<Text @click="edit" v-if="editType == true" class="grid-text_r">完成</Text> <Text @click="edit" v-if="editType == true" class="grid-text_r">完成</Text>
</view> </view>
<view style="width: 100%; height: 30rpx; background: #f7f7f7; margin: 20rpx 0;"></view> <view style="width: 100%; height: 30rpx; background: #f7f7f7; margin: 20rpx 0;"></view>
<u-empty v-if="emptyshow == true" text="购物车还是空的哦" mode="car"></u-empty> <u-empty v-if="emptyshow == true" text="购物车还是空的哦" mode="car"></u-empty>
<view v-if="list.length > 0" <view v-if="list.length > 0"
style="height: calc(100vh - 60px-30px-35px-20px);width: calc(100vw);overflow: hidden;padding-top: 10px;"> style="height: calc(100vh - 60px-30px-35px-20px);width: calc(100vw);overflow: hidden;padding-top: 10px;">
<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" :style="{ height: '100%' }"> <scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" :style="{ height: '100%' }">
...@@ -77,7 +76,7 @@ ...@@ -77,7 +76,7 @@
<view class="The-title"> <view class="The-title">
{{ item.GoodsName}} {{ item.GoodsName}}
</view> </view>
<view v-if="item.EduData.ClassCondition.length>0" class="limit" @touchstart="mouseover()" @touchend="mouseLeave()"> <view v-if="item.EduData&&item.EduData.ClassCondition&&item.EduData.ClassCondition.length>0" class="limit" @touchstart="mouseover()" @touchend="mouseLeave()">
<u-icon name="lock" size="44" :color="mc" /> <u-icon name="lock" size="44" :color="mc" />
<view class="limit-box" v-show="limitShow"> <view class="limit-box" v-show="limitShow">
此课程有报名限制，请点击详情查看 此课程有报名限制，请点击详情查看
...@@ -113,7 +112,7 @@ ...@@ -113,7 +112,7 @@
<!-- <Text v-if='u.TenantId==27&&item.EduData.ClassTime' style="color: #a0a09d;font-size: 22rpx;margin-right: 5rpx;"> <!-- <Text v-if='u.TenantId==27&&item.EduData.ClassTime' style="color: #a0a09d;font-size: 22rpx;margin-right: 5rpx;">
上课时间:{{item.EduData.ClassTime}} 上课时间:{{item.EduData.ClassTime}}
</Text> --> </Text> -->
<view v-if="item.EduData.ClassTimeList.length>0&&u.TenantId==27" <view v-if="item.EduData&&item.EduData.ClassTimeList&&item.EduData.ClassTimeList.length>0&&u.TenantId==27"
style="color: #a0a09d;font-size: 22rpx;margin-right: 5rpx;"> style="color: #a0a09d;font-size: 22rpx;margin-right: 5rpx;">
<view v-if="!item.show"> <view v-if="!item.show">
<view style='display: flex; <view style='display: flex;
......
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