Commit 022407ce authored by 李俊赕's avatar 李俊赕

Merge branch 'dev-photo-v2' of https://git.banshouhui.com/heyinchen/take_order into dev-photo-v2

parents 5097b821 f82046bc
...@@ -125,9 +125,11 @@ ...@@ -125,9 +125,11 @@
"path": "pages/photo/setting", "path": "pages/photo/setting",
"style": { "style": {
"navigationBarTitleText": "水印设置", "navigationBarTitleText": "水印设置",
"navigationBarBackgroundColor": "#333333", "navigationBarBackgroundColor":"#FFFFFF",
"navigationBarTextStyle": "#FFFFFF", "backgroundColor":"#F4F5F7"
"disableScroll": true // "navigationBarBackgroundColor": "#333333",
// "navigationBarTextStyle": "#FFFFFF",
// "disableScroll": true
} }
}, },
{ {
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
<view class="topTitle"><text>{{ dataItem.title }}</text></view> <view class="topTitle"><text>{{ dataItem.title }}</text></view>
<view class="ph-pr-content"> <view class="ph-pr-content">
<view v-for="(item,ikey) in dataItem.data" <view v-for="(item,ikey) in dataItem.data"
:class="param[dataItem.type] === item._id ? 'select-item-view' : 'item-view'" :class="param[dataItem.type] === item.id ? 'select-item-view' : 'item-view'"
@click="itemClick(dataItem.type, item)" :key="item._id"> @click="itemClick(dataItem.type, item, ikey)" :key="item.id">
<text class="itemTitle">{{item.name}}</text> <text class="itemTitle">{{item.name}}</text>
</view> </view>
</view> </view>
...@@ -59,8 +59,7 @@ ...@@ -59,8 +59,7 @@
}, },
onLoad(e) { onLoad(e) {
getApp().trackPage('选择产品页') getApp().trackPage('选择产品页')
this.getclassifyList() this.getRelationDictionaryV2()
}, },
onShareAppMessage(res) { onShareAppMessage(res) {
let shareObj = { let shareObj = {
...@@ -73,68 +72,45 @@ ...@@ -73,68 +72,45 @@
return shareObj return shareObj
}, },
methods: { methods: {
getRelationDictionaryV2: function() {
getclassifyList: function() { this.$u.cloudApi.getRelationDictionaryV2().then(res => {
console.log('V2:')
let that = this
this.$u.cloudApi.getClassifyDictionary().then(res => {
console.log('获取产品数据:')
console.log(res) console.log(res)
if (res.result && res.result.data) { if (res && res.result) {
that.classifyList = res.result.data this.classifyList = res.result
that.param.classifyId = that.classifyList[0]._id this.param.classifyId = res.result[0].id
that.$u.cloudApi.getRelationDictionary({ this.systemList = res.result[0].child
"classify_id": that.param.classifyId,
"field": "system_id"
}).then(res1 => {
that.systemList = res1.result
})
} }
}) })
}, },
//选择 点击 //选择 点击
itemClick: function(type, item) { itemClick: function(type, item, ikey) {
switch (type) { switch (type) {
case 'classifyId': case 'classifyId':
this.param = { this.param = {
classifyId: item._id, classifyId: item.id,
systemId: '', systemId: '',
brandId: '' brandId: ''
} }
this.selectedAll = false this.selectedAll = false
this.systemList = [] this.systemList = this.classifyList[ikey].child
this.brandList = [] this.brandList = []
this.$u.cloudApi.getRelationDictionary({
"classify_id": this.param.classifyId,
"field": "system_id"
}).then(res => {
this.systemList = res.result
})
break break
case 'systemId': case 'systemId':
this.param = { this.param = {
classifyId: this.param.classifyId, classifyId: this.param.classifyId,
systemId: item._id, systemId: item.id,
brandId: '' brandId: ''
} }
this.selectedAll = false this.selectedAll = false
this.brandList = [] this.brandList = this.systemList[ikey].child
this.$u.cloudApi.getRelationDictionary({
"classify_id": this.param.classifyId,
"system_id": this.param.systemId,
"field": "brand_id"
}).then(res => {
console.log('获取品牌数据:', res)
this.brandList = res.result
})
break break
case 'brandId': case 'brandId':
this.param.brandId = item._id this.param.brandId = item.id
this.selectedAll = true this.selectedAll = true
this.brandName = item.name this.brandName = item.name
break break
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<script> <script>
import qiniup from '@/components/upload/qiniup'; import qiniup from '@/components/upload/qiniup';
const app = getApp()
export default { export default {
mixins: [qiniup], mixins: [qiniup],
data() { data() {
...@@ -25,9 +26,18 @@ ...@@ -25,9 +26,18 @@
fileMaps: [], fileMaps: [],
keys: [], keys: [],
token: '', token: '',
product: '',
} }
}, },
onLoad(e) { onLoad(e) {
// 获取照片选项对象
const product = app.globalData.photo.product
this.product = `?brandId=${product.brandId}&brand=${product.brandName}&classifyId=${product.classifyId}&systemId=${product.systemId}`
if(app.globalData.photo.currentItem) {
// 获取规格Id
this.standardId = app.globalData.photo.currentItem._id
}
getApp().trackPage('照片预览页') getApp().trackPage('照片预览页')
const globalTempPath = getApp().globalData.photo.tempPath const globalTempPath = getApp().globalData.photo.tempPath
if(globalTempPath && globalTempPath.mixWater){ if(globalTempPath && globalTempPath.mixWater){
...@@ -41,6 +51,9 @@ ...@@ -41,6 +51,9 @@
this.images = [e.img] this.images = [e.img]
// this.downloadImages() // this.downloadImages()
} }
// if() {
// }
console.log(this.images, 'this.images') console.log(this.images, 'this.images')
this.token = getApp().globalData.token this.token = getApp().globalData.token
...@@ -122,6 +135,7 @@ ...@@ -122,6 +135,7 @@
}, },
submitFile() { submitFile() {
let self = this let self = this
if(self.keys.length) { if(self.keys.length) {
for (let s of self.keys) { for (let s of self.keys) {
self.$u.cloudApi.saveImage({ self.$u.cloudApi.saveImage({
......
This diff is collapsed.
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