Commit b4da39a4 by wjw

wjw-页面适配

parent 88f2e258
...@@ -68,7 +68,8 @@ ...@@ -68,7 +68,8 @@
"l-collapse": "../miniprogram_npm/lin-ui/collapse/index", "l-collapse": "../miniprogram_npm/lin-ui/collapse/index",
"l-collapse-item": "../miniprogram_npm/lin-ui/collapse-item/index", "l-collapse-item": "../miniprogram_npm/lin-ui/collapse-item/index",
"l-textarea": "../miniprogram_npm/lin-ui/textarea/index", "l-textarea": "../miniprogram_npm/lin-ui/textarea/index",
"l-notice-bar": "../miniprogram_npm/lin-ui/notice-bar/index" "l-notice-bar": "../miniprogram_npm/lin-ui/notice-bar/index",
"l-popup": "./miniprogram_npm/lin-ui/popup/index"
}, },
"window": { "window": {
"navigationStyle": "custom", "navigationStyle": "custom",
......
<view class="tips"> <view class="tips">
<view class="tips-img"><image src="../../assets/icon_wraning.png" mode="widthFix"></image></view> <view class="tips-img"><image src="/image/fail-glod.png" mode="widthFix"></image></view>
<view class="tips-text">{{text}}</view> <view class="tips-text">{{text}}</view>
</view> </view>
image/cart.png

844 Bytes

...@@ -17,7 +17,7 @@ Page({ ...@@ -17,7 +17,7 @@ Page({
goods_num: 1, goods_num: 1,
store_num: 1, store_num: 1,
checked: true, checked: true,
img: '/assets/logo.png' img: './image/item01.png'
}, },
{ {
goods_id: 1, goods_id: 1,
...@@ -28,7 +28,7 @@ Page({ ...@@ -28,7 +28,7 @@ Page({
goods_num: 1, goods_num: 1,
store_num: 2, store_num: 2,
checked: true, checked: true,
img: '/assets/logo.png' img: './image/item01.png'
}, },
{ {
goods_id: 2, goods_id: 2,
...@@ -36,7 +36,7 @@ Page({ ...@@ -36,7 +36,7 @@ Page({
goods_now_price: 30.00, goods_now_price: 30.00,
goods_num: 2, goods_num: 2,
checked: true, checked: true,
img: '/assets/logo.png' img: './image/item01.png'
}, },
{ {
goods_id: 3, goods_id: 3,
...@@ -44,18 +44,18 @@ Page({ ...@@ -44,18 +44,18 @@ Page({
goods_now_price: 78, goods_now_price: 78,
goods_num: 12, goods_num: 12,
checked: false, checked: false,
img: '/assets/logo.png' img: './image/item01.png'
} }
], ],
notEnough: [ notEnough: [
{ {
id: 0, id: 0,
img: '../../assets/enough01.png', img: './image/item01.png',
title: '葱爆牛肉佐秘制麻椒汁' title: '葱爆牛肉佐秘制麻椒汁'
}, },
{ {
id: 1, id: 1,
img: '../../assets/enough01.png', img: './image/item01.png',
title: '抹茶酸奶芝士' title: '抹茶酸奶芝士'
} }
] ]
......
{ {
"usingComponents": { "usingComponents": {
"Tips": "../../components/Tips/Tips", "Tips": "../../../component/Tips/Tips",
"Blank": "../../components/Blank/Blank" "Blank": "../../../component/Blank/Blank"
}, },
"navigationStyle": "default",
"navigationBarBackgroundColor": "#fff",
"navigationBarTitleText": "购物车" "navigationBarTitleText": "购物车"
} }
\ No newline at end of file
<view class="header row align-c"> <view class="header row align-c">
<view class="header_img"> <view class="header_img">
<image mode="aspectFill" src="/assets/logo.png" /> <image mode="aspectFill" src="./image/item01.png" />
</view> </view>
<view class="header_title">儿童营地</view> <view class="header_title">儿童营地</view>
<view class="header_clear row align-c" bindtap="handleClearCart">清空</view> <view class="header_clear row align-c" bindtap="handleClearCart">清空</view>
......
...@@ -57,7 +57,7 @@ Page({ ...@@ -57,7 +57,7 @@ Page({
goods_now_text: '业主价', goods_now_text: '业主价',
goods_num: 1, goods_num: 1,
checked: true, checked: true,
img: '/assets/item01.png' img: './image/cola.png'
}, },
{ {
goods_id: 1, goods_id: 1,
...@@ -68,7 +68,7 @@ Page({ ...@@ -68,7 +68,7 @@ Page({
goods_now_text: '活动价', goods_now_text: '活动价',
goods_num: 1, goods_num: 1,
checked: true, checked: true,
img: '/assets/item01.png' img: './image/cola.png'
}, },
{ {
goods_id: 2, goods_id: 2,
...@@ -76,7 +76,7 @@ Page({ ...@@ -76,7 +76,7 @@ Page({
goods_now_price: 30.00, goods_now_price: 30.00,
goods_num: 2, goods_num: 2,
checked: true, checked: true,
img: '/assets/item01.png' img: './image/cola.png'
}, },
{ {
goods_id: 3, goods_id: 3,
...@@ -85,7 +85,7 @@ Page({ ...@@ -85,7 +85,7 @@ Page({
goods_now_price: 78, goods_now_price: 78,
goods_num: 12, goods_num: 12,
checked: false, checked: false,
img: '/assets/item01.png' img: './image/cola.png'
} }
], ],
popupObj: { popupObj: {
......
{ {
"usingComponents": { "usingComponents": {
"Blank": "../../components/Blank/Blank" "Blank": "../../../component/Blank/Blank"
}, },
"navigationBarTitleText": "原味书食" "navigationBarTitleText": "购物车",
"navigationStyle": "default",
"navigationBarBackgroundColor": "#fff"
} }
\ No newline at end of file
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</view> </view>
<view class="goods_add_btn_wrap row con-e" bindtap="handleAddCartPopup"> <view class="goods_add_btn_wrap row con-e" bindtap="handleAddCartPopup">
<l-button l-class="l-btn-circle" height="44" width="44" bg-color="#86C5E1" bind="handleAddCartPopup"> <l-button l-class="l-btn-circle" height="44" width="44" bg-color="#86C5E1" bind="handleAddCartPopup">
<image mode="widthFix" src="../../assets/icon_add2.png"></image> <image mode="widthFix" src="/image/add-w.png"></image>
</l-button> </l-button>
</view> </view>
</view> </view>
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<view class="cart_btn row con-c align-c" bindtap="goToCart"> <view class="cart_btn row con-c align-c" bindtap="goToCart">
<view class="cart_num row con-c align-c">{{cart.length}}</view> <view class="cart_num row con-c align-c">{{cart.length}}</view>
<view class="cart_img_wrap"> <view class="cart_img_wrap">
<image src="../../assets/icon_cart.png" mode="widthFix"></image> <image src="../../../image/cart.png" mode="widthFix"></image>
</view> </view>
</view> </view>
<navigator url="/pages/orderDetail/index">订单详情</navigator> <navigator url="/pages/orderDetail/index">订单详情</navigator>
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<l-popup show="{{showPopup}}" content-align="center" locked="{{true}}"> <l-popup show="{{showPopup}}" content-align="center" locked="{{true}}">
<view class="popup_wrap"> <view class="popup_wrap">
<view class="popup_img_wrapper"> <view class="popup_img_wrapper">
<image mode="widthFix" src="../../assets/popup.png"></image> <image mode="widthFix" src="./image/popup.png"></image>
</view> </view>
<view class="popup_info_wrapper"> <view class="popup_info_wrapper">
<view class="popuo_info_title">咖喱蔬菜大虾</view> <view class="popuo_info_title">咖喱蔬菜大虾</view>
...@@ -75,12 +75,12 @@ ...@@ -75,12 +75,12 @@
</view> </view>
<view class="popup_close_btn row con-c align-c" bindtap="handleClosePopup"> <view class="popup_close_btn row con-c align-c" bindtap="handleClosePopup">
<view class="popup_close"> <view class="popup_close">
<image mode="widthFix" src="../../assets/icon_close.png"></image> <image mode="widthFix" src="../../../image/icon_close.png"></image>
</view> </view>
</view> </view>
</l-popup> </l-popup>
<!-- 添加成功 --> <!-- 添加成功 -->
<l-toast show="{{true}}" duration="100000" l-class="toast_bg" icon="success" icon-color="#fff" title="添加购物车成功" /> <l-toast show="{{true}}" duration="100000" l-class="toast_bg" image="../../../image/success.png" icon="success" icon-color="#fff" title="添加购物车成功" />
</view> </view>
</view> </view>
<Blank></Blank> <Blank></Blank>
...@@ -15,7 +15,7 @@ Page({ ...@@ -15,7 +15,7 @@ Page({
// phone: '17612345222', // phone: '17612345222',
// useNum:'1件商品可用', // useNum:'1件商品可用',
// useTime: '2019.09.30 - 2020.12.30', // useTime: '2019.09.30 - 2020.12.30',
// sealImg: '../../assets/seal.png' // sealImg: './image/seal.png'
// }, // },
// ticketInfo: { // ticketInfo: {
// status: 1, // 0未使用 1待评价 2已过期 3已取消 4已评价 5待付款 // status: 1, // 0未使用 1待评价 2已过期 3已取消 4已评价 5待付款
...@@ -27,7 +27,7 @@ Page({ ...@@ -27,7 +27,7 @@ Page({
// phone: '17612345222', // phone: '17612345222',
// useNum:'1件商品可用', // useNum:'1件商品可用',
// useTime: '2019.09.30 - 2020.12.30', // useTime: '2019.09.30 - 2020.12.30',
// sealImg: '../../assets/seal2.png' // sealImg: './image/seal2.png'
// }, // },
// ticketInfo: { // ticketInfo: {
// status: 1, // 0未使用 1待评价 2已过期 3已取消 4已评价 5待付款 // status: 1, // 0未使用 1待评价 2已过期 3已取消 4已评价 5待付款
...@@ -39,8 +39,8 @@ Page({ ...@@ -39,8 +39,8 @@ Page({
// phone: '17612345222', // phone: '17612345222',
// useNum:'1件商品可用', // useNum:'1件商品可用',
// useTime: '2019.09.30 - 2020.12.30', // useTime: '2019.09.30 - 2020.12.30',
// sealImg: '../../assets/seal2.png', // sealImg: './image/seal2.png',
// sealImg2: '../../assets/seal2-1.png' // sealImg2: './image/seal2-1.png'
// }, // },
ticketInfo: { ticketInfo: {
type: 'movie', type: 'movie',
...@@ -51,44 +51,44 @@ Page({ ...@@ -51,44 +51,44 @@ Page({
phone: '17612345222', phone: '17612345222',
useNum:'3张电影票', useNum:'3张电影票',
useTime: '2019.09.30 - 2020.12.30', useTime: '2019.09.30 - 2020.12.30',
sealImg: '../../assets/seal2.png', sealImg: './image/seal2.png',
sealImg2: '../../assets/seal2-1.png' sealImg2: './image/seal2-1.png'
}, },
goodsInfo:{ goodsInfo:{
titleImg: '../../assets/goods_title.png', titleImg: './image/goods_title.png',
title: '海错图展馆', title: '海错图展馆',
list: [ list: [
{ {
id: 0, id: 0,
infoText: '《海错图》展览单人门票', infoText: '《海错图》展览单人门票',
img: '../../assets/goods_item.png', img: './image/goods_item.png',
price: '30.60', price: '30.60',
used: '查看券码' used: '查看券码'
}, },
{ {
id: 1, id: 1,
infoText: '《海错图》展览单人门票', infoText: '《海错图》展览单人门票',
img: '../../assets/goods_item.png', img: './image/goods_item.png',
price: '30.60', price: '30.60',
used: '已使用' used: '已使用'
}, },
] ]
}, },
// goodsInfo:{ // goodsInfo:{
// titleImg: '../../assets/good2.png', // titleImg: './image/good2.png',
// title: '元养水韵SPA', // title: '元养水韵SPA',
// list: [ // list: [
// { // {
// id: 0, // id: 0,
// infoText: '肌底补水保湿焕肤提亮SPA套餐', // infoText: '肌底补水保湿焕肤提亮SPA套餐',
// img: '../../assets/goods_item2.png', // img: './image/goods_item2.png',
// price: '30.60', // price: '30.60',
// used: '查看券码' // used: '查看券码'
// }, // },
// { // {
// id: 1, // id: 1,
// infoText: '泰国皇室经典SPA', // infoText: '泰国皇室经典SPA',
// img: '../../assets/goods_item2.png', // img: './image/goods_item2.png',
// price: '30.60', // price: '30.60',
// used: '已使用' // used: '已使用'
// }, // },
...@@ -105,16 +105,20 @@ Page({ ...@@ -105,16 +105,20 @@ Page({
{ {
id: 0, id: 0,
title: '《 阿凡达 》电影票', title: '《 阿凡达 》电影票',
img: '../../assets/QRcode.png', img: './image/QRcode.png',
num: '2179 7092 0925' num: '2179 7092 0925'
}, },
{ {
id: 1, id: 1,
content: 2 title: '《 阿凡达 》电影票',
img: './image/QRcode.png',
num: '2179 7092 0925'
}, },
{ {
id: 2, id: 2,
content: 3 title: '《 阿凡达 》电影票',
img: './image/QRcode.png',
num: '2179 7092 0925'
} }
] ]
}, },
...@@ -167,7 +171,6 @@ Page({ ...@@ -167,7 +171,6 @@ Page({
}, },
swiperChange(e) { swiperChange(e) {
let swiperCurrent = e.detail.current let swiperCurrent = e.detail.current
console.log(swiperCurrent)
this.setData({ this.setData({
swiperCurrent swiperCurrent
}) })
......
{ {
"usingComponents": { "usingComponents": {
"Tips": "../../components/Tips/Tips", "Tips": "../../../component/Tips/Tips",
"Blank": "../../components/Blank/Blank" "Blank": "../../../component/Blank/Blank"
}, },
"navigationBarTitleText": "订单详情" "navigationBarTitleText": "订单详情",
"navigationStyle": "default",
"navigationBarBackgroundColor": "#fff"
} }
\ No newline at end of file
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
<text class="total-img-num">{{codeList.length}}</text> <text class="total-img-num">{{codeList.length}}</text>
</view> </view>
<view class="code-close-btn row con-c align-c" bindtap="closeQRcode"> <view class="code-close-btn row con-c align-c" bindtap="closeQRcode">
<image mode="widthFix" src="../../assets/icon_close.png"></image> <image mode="widthFix" src="/image/icon_close.png"></image>
</view> </view>
</view> </view>
</l-popup> </l-popup>
......
{ {
"usingComponents": { "usingComponents": {
"Tips": "../../components/Tips/Tips", "Tips": "../../../component/Tips/Tips",
"Blank": "../../components/Blank/Blank" "Blank": "../../../component/Blank/Blank"
}, },
"navigationBarTitleText": "确认订单" "navigationBarTitleText": "确认订单",
"navigationStyle": "default",
"navigationBarBackgroundColor": "#fff"
} }
\ No newline at end of file
...@@ -14,10 +14,10 @@ ...@@ -14,10 +14,10 @@
<view class="card-right">2019.09.30 - 2020.09.30</view> <view class="card-right">2019.09.30 - 2020.09.30</view>
</view> </view>
<view class="card-bg"> <view class="card-bg">
<image mode="widthFix" src="../../assets/logo1.png"></image> <image mode="widthFix" src="./image/logo1.png"></image>
</view> </view>
<view class="card-logo"> <view class="card-logo">
<image mode="widthFix" src="../../assets/logo2.png"></image> <image mode="widthFix" src="./image/logo2.png"></image>
</view> </view>
</view> </view>
......
...@@ -114,6 +114,14 @@ ...@@ -114,6 +114,14 @@
"id": -1, "id": -1,
"name": "pages/moreProblems/moreProblems", "name": "pages/moreProblems/moreProblems",
"pathName": "pages/moreProblems/moreProblems", "pathName": "pages/moreProblems/moreProblems",
"query": "",
"scene": null
},
{
"id": 7,
"name": "pages/commodity/snacks/snacks",
"pathName": "pages/commodity/snacks/snacks",
"query": "",
"scene": null "scene": null
} }
] ]
......
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 sign in to comment