Skip to content

W
wly-APP
Commit 5ff64474 authored by chuan.liu's avatar chuan.liu
Browse files
Options

创意酒页面新增

parent c4ff3bea
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 791 additions and 7 deletions
App.vue
View file @ 5ff64474
...@@ -72,6 +72,14 @@ ...@@ -72,6 +72,14 @@
background: transparent; background: transparent;
} }
uni-button:after {
display: none;
}
.uni-input-placeholder {
color: #DBDBDB;
}
image { image {
display: inline-block; display: inline-block;
} }
......
manifest.json
View file @ 5ff64474
...@@ -109,6 +109,10 @@ ...@@ -109,6 +109,10 @@
"target" : "http://10.0.135.139", "target" : "http://10.0.135.139",
// "target" : "http://10.2.4.2", // "target" : "http://10.2.4.2",
"changeOrigin" : true "changeOrigin" : true
},
"/wmdpwebservices" : {
"target" : "http://10.0.134.182:9002",
"changeOrigin" : true
} }
} }
} }
......
pages.json
View file @ 5ff64474
...@@ -687,6 +687,38 @@ ...@@ -687,6 +687,38 @@
} }
// "enablePullDownRefresh": true // "enablePullDownRefresh": true
} }
},
{
"path": "pages/diy-wine/diy-wine",
"style": {
"app-plus": {
"titleNView": {
"titleAlign": "left",
"titleColor": "#333",
"titleSize": "17px",
"backgroundColor": "transparent",
"titleText": "定制酒信息",
"autoBackButton": true
},
"bounce": "none"
}
}
},
{
"path": "pages/breakwords-clue/breakwords-clue",
"style": {
"app-plus": {
"titleNView": {
"titleAlign": "left",
"titleColor": "#333",
"titleSize": "17px",
"backgroundColor": "transparent",
"titleText": "提报市场违约线索",
"autoBackButton": true
},
"bounce": "none"
}
}
} }
], ],
"globalStyle": { "globalStyle": {
......
pages/breakwords-clue/breakwords-clue.vue 0 → 100644
View file @ 5ff64474
This diff is collapsed.
pages/diy-wine/diy-wine.nvue 0 → 100644
View file @ 5ff64474
<template>
<view class="lists">
<view class="status_bar" :style="navHeight"></view>
<view class="header-bg">
<image class="header-bg-img" src="@/static/image/nav_bg@3x.png" mode="scaleToFill"></image>
</view>
<view class="main">
<view class="img-block view">
<button class="img-block-submit" type="default">完成</button>
<image src="../../static/image/logo.svg" mode=""></image>
<image class="img-block-logo" src="../../static/image/address@3x.png" mode=""></image>
</view>
<view class="tags-block view">
<view class="tags-nav">
<text class="nav-item nav-item_active">婚庆定制</text>
<text class="nav-item">商务科技</text>
<text class="nav-item">宴会类别</text>
</view>
<scroll-view class="scroll-view" scroll-x="true" scroll-left="120">
<view class="scroll-view-item scroll-view-item_active scroll-view-item_first">A</view>
<view class="scroll-view-item">B</view>
<view class="scroll-view-item">C</view>
<view class="scroll-view-item">D</view>
<view class="scroll-view-item">D</view>
<view class="scroll-view-item">D</view>
<view class="scroll-view-item">D</view>
</scroll-view>
</view>
<view class="middle view planout-block-item" v-for="(item,index) in lists" :key='item.PRODUCT_ID'
@click="handleChecked($event,item, index)">
<text class="item-name">五粮液/八代系列/(191)52%</text>
<view class="text-block">
<text class="middle-date middle-date-select">定制数量</text>
<text class="middle-date-des middle-date-des-select">2</text>
</view>
<view class="text-block">
<text class="middle-date middle-date-select">收货方名称</text>
<text class="middle-date-des middle-date-des-select">3</text>
</view>
<view class="text-block">
<text class="middle-date middle-date-select">联系人</text>
<text class="middle-date-des middle-date-des-select">2</text>
</view>
<view class="text-block">
<text class="middle-date middle-date-select">地址</text>
<text class="middle-date-des middle-date-des-select">广东省惠州市龙门县平安大道99号s</text>
</view>
<view class="text-block">
<text class="middle-date middle-date-select">CRM订单号</text>
<text class="middle-date-des middle-date-des-select">2</text>
</view>
<view class="text-block">
<text class="middle-date middle-date-select">经销商名称</text>
<text class="middle-date-des middle-date-des-select">2</text>
</view>
<view class="text-block text-block-last">
<text class="middle-date middle-date-select">外箱喷码内容</text>
<text class="middle-date-des middle-date-des-select">2</text>
</view>
</view>
<!-- </uni-swipe-action-item>
</uni-swipe-action> -->
</view>
</view>
</template>
<script>
import {
mapState
} from 'vuex'
import {
apiProductSelect
} from '@/servers/produceOrder.js'
export default {
data() {
return {
scrollTop: 0,
isOpened: 'none',
lists: [{
checked: false,
"PRODUCT_ID": "",
"SHORT_TEXT": "",
"NORMS": "",
}],
selectedProduct: {},
toPageParams: {
page: '',
mode: '',
index: 0,
head: {}
}
}
},
computed: {
...mapState(['sysinfo', 'userInfo']),
navHeight() {
return {
'height': `${this.sysinfo.safeArea.top + 44}px`
}
},
scrollHeight() {
return {
'height': `${this.sysinfo.safeArea.height - 237- 44 - 20}px`
}
}
},
created() {},
methods: {
}
}
</script>
<style lang="scss" scoped>
.view {
flex-direction: column;
}
.header-bg {
height: 284rpx;
margin-top: -88rpx;
}
.header-bg-img {
width: 750rpx;
}
.lists {
position: relative;
flex-direction: column;
overflow-y: scroll;
background: #f0f4f5;
overflow-x: hidden;
height: 100vh;
}
.main {
position: relative;
flex-direction: column;
margin-top: -164rpx;
}
.img-block {
position: relative;
flex: 1;
height: 600rpx;
background-color: #feffff;
}
.img-block-logo {
position: absolute;
left: 325rpx;
top: 250rpx;
width: 100rpx;
height: 100rpx;
}
.img-block-submit {
position: absolute;
right: 18rpx;
top: 26rpx;
width: 85px;
height: 39px;
line-height: 80rpx;
background: #ffffff;
border: 1px solid #d8d8d9;
border-radius: 20px;
color: #333;
font-size: 28rpx;
}
.middle {
background-color: #fff;
border-radius: 16rpx;
padding: 48rpx 32rpx 32rpx 32rpx;
}
.text-block {
display: flex;
overflow: hidden;
height: 96rpx;
}
.item-name {
font-size: 14px;
color: #333;
font-weight: 600;
}
.text-block-last {
margin-bottom: 0;
border-bottom: 0;
}
.middle-date {
flex: 2;
font-size: 28rpx;
line-height: 96rpx;
color: #333;
margin-bottom: 8rpx;
}
.middle-date-des {
flex: 3;
font-size: 24rpx;
line-height: 96rpx;
height: 96rpx;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
color: #888;
}
.middle-date-select {
color: #999;
font-size: 12px;
}
.middle-date-des-select {
color: #333;
text-align: right;
}
.uni-list-cell {
flex: 1;
}
.uni-list-cell-db {
flex: 1;
}
.planout-block-item {
flex: 1;
width: 750rpx;
margin-bottom: 26rpx;
}
.tags-nav {
display: flex;
align-items: center;
justify-content: space-around;
padding: 8px 0;
}
.nav-item {
flex: 1;
font-size: 12px;
text-align: center;
color: #888;
}
.nav-item_active {
color: #333;
}
.scroll-view {
white-space: nowrap;
width: 750rpx;
background: #f0f4f5;
padding-bottom: 16px;
}
.scroll-view-item {
display: inline-block;
width: 120rpx;
height: 120rpx;
background-color: #fff;
line-height: 120rpx;
text-align: center;
border-radius: 2px;
margin-right: 28rpx;
}
.scroll-view-item_first {
margin-left: 32rpx;
}
.scroll-view-item_active {
border: 1px solid #ff1d32;
}
</style>
pages/order-detail-group/order-detail-group.nvue
View file @ 5ff64474
...@@ -40,7 +40,13 @@ ...@@ -40,7 +40,13 @@
</view> </view>
<view class="text-block-box text-block-box-last"> <view class="text-block-box text-block-box-last">
<view class="text-block text-block-last"> <view class="text-block text-block-last">
<text class="middle-date">{{INFO.ZZFLD000099}}</text> <view class="middle-date">{{INFO.ZZFLD000099}}
<button class="diy-entry" type="default" @click="goDiyPage">
<image class="diy-icon" src="../../static/image/address@3x.png" mode="">
</image>
<text class="diy-entry-text">定制酒</text>
</button>
</view>
<text class="middle-date-des">是否盒外刻字</text> <text class="middle-date-des">是否盒外刻字</text>
</view> </view>
<view class="text-block text-block-last"> <view class="text-block text-block-last">
...@@ -219,6 +225,11 @@ ...@@ -219,6 +225,11 @@
this.receiveInfoHeight = '132' this.receiveInfoHeight = '132'
} }
}, },
goDiyPage() {
uni.navigateTo({
url: "/pages/diy-wine/diy-wine"
})
}
} }
} }
</script> </script>
...@@ -521,4 +532,25 @@ ...@@ -521,4 +532,25 @@
.icon-arrow-rotate { .icon-arrow-rotate {
transform: rotate(180deg); transform: rotate(180deg);
} }
.diy-entry {
width: 160rpx;
height: 50rpx;
line-height: 46rpx;
border: 1px solid #F61D30;
background: #fff;
border-radius: 32rpx;
margin-left: 16rpx;
}
.diy-icon {
width: 24rpx;
height: 20rpx;
margin-right: 8rpx;
}
.diy-entry-text {
color: #F61D30;
font-size: 12px;
}
</style> </style>
pages/order-detail-noquota/order-detail-noquota.nvue
View file @ 5ff64474
...@@ -200,7 +200,6 @@ ...@@ -200,7 +200,6 @@
.header-bg { .header-bg {
height: 284rpx; height: 284rpx;
opacity: 0.72;
margin-top: -88rpx; margin-top: -88rpx;
} }
......
servers/user.js
View file @ 5ff64474
...@@ -12,6 +12,13 @@ export async function apiLogin(params) { ...@@ -12,6 +12,13 @@ export async function apiLogin(params) {
return res return res
} }
// export async function apiLogin(params) {
// const res = await apiHelper.post('/wmdpwebservices/dictionary/getDictionary', {
// dictionaryKey: ''
// })
// return res
// }
export default { export default {
apiLogin apiLogin
} }
static/.DS_Store
View file @ 5ff64474
No preview for this file type
unpackage/dist/dev/app-plus/app-service.js
View file @ 5ff64474
This diff is collapsed.
unpackage/dist/dev/app-plus/manifest.json
View file @ 5ff64474
{"@platforms":["android","iPhone","iPad"],"id":"__UNI__343534B","name":"五粮液APP","version":{"name":"1.0.0","code":"100"},"description":"订货系统","launch_path":"","developer":{"name":"","email":"","url":""},"permissions":{"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview","render":"always","uniNView":{"path":"pages/login/login.js"}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#fff"},"usingComponents":true,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","nvue":{"flex-direction":"row"},"distribute":{"icons":{"android":{"hdpi":"unpackage/res/icons/72x72.png","xhdpi":"unpackage/res/icons/96x96.png","xxhdpi":"unpackage/res/icons/144x144.png","xxxhdpi":"unpackage/res/icons/192x192.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"google":{"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"],"abiFilters":["armeabi-v7a"]},"apple":{},"plugins":{"ad":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"arguments":"{\"name\":\"me\",\"query\":\"uuid=c4bba940-f69e-11ea-a419-6bafda9d095e&__id__=1\",\"id\":0,\"pathName\":\"pages/login/login\"}","allowsInlineMediaPlayback":true,"safearea":{"background":"rgba(250,250,250,0.90)","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"3.4.14","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"row"},"nvueLaunchMode":"normal"},"tabBar":{"iconWidth":"19px","spacing":"4px","color":"#999999","selectedColor":"#FF1D32","borderStyle":"rgba(250,250,250,0.90)","backgroundColor":"rgba(250,250,250,0.90)","list":[{"pagePath":"pages/home/home","iconPath":"static/image/home@3x.png","selectedIconPath":"static/image/home_red@3x.png","text":"首页"},{"pagePath":"pages/go-order/go-order","iconPath":"static/image/tab_order@3x.png","selectedIconPath":"static/image/tab_order_red@3x.png","text":"下单"},{"pagePath":"pages/purchase/purchase","iconPath":"static/image/tab_purchase@3x.png","selectedIconPath":"static/image/tab_purchase_red@3x.png","text":"要货"},{"pagePath":"pages/message/message","iconPath":"static/image/tab_message@3x.png","selectedIconPath":"static/image/tab_message_red@3x.png","text":"消息"},{"pagePath":"pages/usercenter/usercenter","iconPath":"static/image/tab_my@3x.png","selectedIconPath":"static/image/tab_my_red@3x.png","text":"我的"}],"height":"50px"}}} {"@platforms":["android","iPhone","iPad"],"id":"__UNI__343534B","name":"五粮液APP","version":{"name":"1.0.0","code":"100"},"description":"订货系统","launch_path":"","developer":{"name":"","email":"","url":""},"permissions":{"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview","render":"always","uniNView":{"path":"pages/login/login.js"}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#fff"},"usingComponents":true,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","nvue":{"flex-direction":"row"},"distribute":{"icons":{"android":{"hdpi":"unpackage/res/icons/72x72.png","xhdpi":"unpackage/res/icons/96x96.png","xxhdpi":"unpackage/res/icons/144x144.png","xxxhdpi":"unpackage/res/icons/192x192.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"google":{"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"],"abiFilters":["armeabi-v7a"]},"apple":{},"plugins":{"ad":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"arguments":"{\"name\":\"me\",\"query\":\"uuid=c4bba940-f69e-11ea-a419-6bafda9d095e&__id__=1\",\"id\":0,\"pathName\":\"pages/login/login\"}","allowsInlineMediaPlayback":true,"safearea":{"background":"rgba(250,250,250,0.90)","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"3.4.15","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"row"},"nvueLaunchMode":"normal"},"tabBar":{"iconWidth":"19px","spacing":"4px","color":"#999999","selectedColor":"#FF1D32","borderStyle":"rgba(250,250,250,0.90)","backgroundColor":"rgba(250,250,250,0.90)","list":[{"pagePath":"pages/home/home","iconPath":"static/image/home@3x.png","selectedIconPath":"static/image/home_red@3x.png","text":"首页"},{"pagePath":"pages/go-order/go-order","iconPath":"static/image/tab_order@3x.png","selectedIconPath":"static/image/tab_order_red@3x.png","text":"下单"},{"pagePath":"pages/purchase/purchase","iconPath":"static/image/tab_purchase@3x.png","selectedIconPath":"static/image/tab_purchase_red@3x.png","text":"要货"},{"pagePath":"pages/message/message","iconPath":"static/image/tab_message@3x.png","selectedIconPath":"static/image/tab_message_red@3x.png","text":"消息"},{"pagePath":"pages/usercenter/usercenter","iconPath":"static/image/tab_my@3x.png","selectedIconPath":"static/image/tab_my_red@3x.png","text":"我的"}],"height":"50px"}}}
\ No newline at end of file \ No newline at end of file
unpackage/dist/dev/app-plus/view.umd.min.js
View file @ 5ff64474
This source diff could not be displayed because it is too large. You can view the blob instead.
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