Commit 81d5ca7a authored by 潘永坪's avatar 潘永坪

Merge remote-tracking branch 'remotes/origin/zhoucong' into develop

# Conflicts:
#	common/common.js
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/vlog/myVlog/myVlog.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/vlog/photoAlbum/photoAlbum.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/vlog/scenicList/scenicList.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/vlog/share/share.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/vlog/vlogIndex/vlogIndex.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/vlog/vlogList/vlogList.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/vlog/vlogface/vlogface.js.map
parents e27d7b24 1e8ba92e
......@@ -11,7 +11,21 @@ export default{
queryTotal=queryTotal.substr(1)
let pageUrl=url+"?"+queryTotal//请求的全路径
return pageUrl
},
today:function(){//默认当天
var now = new Date();
var day = ("0" + now.getDate()).slice(-2);
var month = ("0" + (now.getMonth() + 1)).slice(-2);
var today = now.getFullYear()+"-"+(month)+"-"+(day) ;
return today
},
todayTime:function(){
var now = new Date();
var hour = now.getHours()<10?'0'+now.getHours():now.getHours()
var minutes = now.getMinutes()<10?'0'+now.getMinutes():now.getMinutes()
var seconds = now.getSeconds()<10?'0'+now.getSeconds():now.getSeconds()
var time = hour+":"+minutes+":"+seconds
return time
}
}
//调用方法时--this.$commonjs.aaa()
\ No newline at end of file
//调用方法时--this.$commonjs.today()
\ No newline at end of file
......@@ -12,7 +12,7 @@ const request = (url = '', data = {}, type = 'POST') => {
method: type,
url: baseUrl + url+'?token='+uni.getStorageSync("token"),
data:data,
dataType: 'json',
dataType: 'json',
}).then((response) => {
uni.hideLoading()
let [error,res] = response;
......
import Vue from 'vue'
Vue.filter('money', function(val) {//格式化金额
if(!val) return '0.00';
let tempVal = parseFloat(val).toFixed(3)
let realVal = tempVal.substring(0, tempVal.length - 1)
var intPart = Number(realVal) - Number(realVal)%1; //获取整数部分(这里是windy93的方法)
var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,'); //将整数部分逢三一断
var value2Array = realVal.toString().split(".");
var floatPart = value2Array[1].toString(); //拿到小数部分
return intPartFormat + "." + floatPart;
})
\ No newline at end of file
import Vue from 'vue'
import App from './App'
import uView from 'uview-ui'
import './flitter'
import request from 'common/request.js'
import "./common/icon/iconfont.css"
import commonjs from "common/common.js"
......@@ -9,6 +10,13 @@ Vue.prototype.$commonjs = commonjs
Vue.prototype.$request = request
Vue.use(uView)
if(process.env.NODE_ENV === 'development'){//开发环境
Vue.prototype.imgUrl = "http://picture.tuyoyoo.com/"
}else{
Vue.prototype.imgUrl = "http://picture.pangdly.com/"
}
Vue.config.productionTip = false
App.mpType = 'app'
const app = new Vue({
......
......@@ -14,18 +14,26 @@
"navigationBarTitleText": "订单支付",
"enablePullDownRefresh": false
}
},
{
"path" : "pages/vlog/orderPay/orderPay",
"style" :
{
"navigationBarTitleText": "订单支付",
"navigationBarTitleText": "确认订单",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor":"#ffffff",
"navigationBarTextStyle": "black"
}
},
{
"path" : "pages/vlog/shippingAddress/shippingAddress",
"style" :
{
"navigationBarTitleText": "填写收货地址",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor":"#ffffff",
"navigationBarTextStyle": "black"
}
}
,{
"path" : "pages/login/login",
......@@ -156,7 +164,7 @@
,{
"path" : "pages/vlog/vlogIndex/vlogIndex",
"style" : {
"navigationBarTitleText": "VLOG",
"navigationBarTitleText": "欢乐影集",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor":"#ffffff",
"navigationBarTextStyle": "black"
......@@ -214,7 +222,7 @@
,{
"path" : "pages/vlog/product/product",
"style" : {
"navigationBarTitleText": "产品",
"navigationBarTitleText": "产品列表",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle": "black"
......
......@@ -12,6 +12,13 @@
}
},
onLoad(option) {
//相册完成支付后删除Storage内保存的数据
uni.removeStorageSync('productVo')
uni.removeStorageSync('coverInside')
uni.removeStorageSync('imgList')
uni.removeStorageSync('checkList')
uni.removeStorageSync('sortImglist')
let pdOpenid=uni.getStorageSync("openid")//胖丁小程序openid,临时用,当公众号授权做好之后可以删除
let pdToken=uni.getStorageSync("token")
let pdCreateUserId=uni.getStorageSync("createUserId")
......
......@@ -53,12 +53,10 @@
<text>
实际支付
</text>
<text>
<!--<i>
¥{{totalMoney}}
</i>-->
<text>
<text style="font-size:28rpx;">¥</text>{{pdOrderMoney}}
</text>
......
......@@ -10,7 +10,7 @@
<!-- start:请在该区域编写自己的渲染逻辑 -->
<view class="info">
<view class="info__item">
<image class="image" :src="item.data.images" mode="widthFix"></image>
<image class="image" :src="imgUrl+item.data.images" mode="widthFix"></image>
</view>
<view class="info__item_btn" @click.stop="replace(item)">
更换
......@@ -21,9 +21,8 @@
</view>
<u-popup v-model="show" mode="bottom" height="50%">
<view style="display: flex;flex-wrap: wrap;width: 100%;">
<view style="width: 25%;padding: 10rpx;" v-for="(item,index) in alternateImages" :key="index">
<image :src="item.images" style="width: 100%;" mode="widthFix" @click="changeImglist(item.images)">
</image>
<view style="width: 25%;padding: 10rpx;" :style="{ height: itemWrapHeight + 'px' }" v-for="(item,index) in alternateImages" :key="index">
<image :src="imgUrl+item.images" style="width: 100%;height: 100%;"@click="changeImglist(item.images)"></image>
</view>
</view>
</u-popup>
......@@ -33,7 +32,7 @@
<script>
export default {
props: {
listData: { // 数据源
listData: { // 已选择图片
type: Array,
default: () => {
return []
......@@ -43,40 +42,15 @@
type: Number,
default: 0
},
alternateImages: { // 备选图片
type: Array,
default: () => {
return []
}
},
},
data() {
return {
alternateImages: [{
images: '/static/images/swipe/1.png'
},
{
images: '/static/images/swipe/2.png'
},
{
images: '/static/images/swipe/3.png'
},
{
images: '/static/images/swipe/4.png'
},
{
images: '/static/images/swipe/5.png'
},
{
images: '/static/images/swipe/6.png'
},
{
images: '/static/images/swipe/7.png'
},
{
images: '/static/images/swipe/8.png'
},
{
images: '/static/images/swipe/9.png'
},
{
images: '/static/images/swipe/10.png'
}
], //备选图片
checkImg: "", //点击更改图片的key
show: false, //照片图库弹出层
cur: -1, // 当前激活的元素
......@@ -481,7 +455,7 @@
color: #fff;
text-align: center;
line-height: 50rpx;
font-size: 20rpx;
font-size: 18rpx;
}
}
......
......@@ -68,6 +68,12 @@
} else { //数据为空
this.show = false
}
}else{
uni.showModal({
title: '提示',
content: res.message,
showCancel: false,
})
}
})
},
......@@ -83,7 +89,6 @@
height: 100%;
width: 100%;
text-align: center;
.noEmpty {
color: #fff;
height: 100%;
......
<template>
<view class="content">
<view class="" style="display: flex;margin-top: 40rpx;">
<view class="" style="display: flex;padding: 40rpx 20rpx 0 20rpx;">
<u-section title="精彩瞬间" :right="false" color="#303133" ></u-section>
<text style="font-size: 24rpx;color: #ccc;margin-left: 30rpx;">MOMENT</text>
</view>
<image src="../../../static/img/vlog/icon/fengexian.png" mode="" style="width: 100%;height: 15rpx;"></image>
<view class="row">
<view class="item" v-for="(item,index) in list" :key="index" @click="pushImg(item)">
<image :src="item.thumbImageUrl" mode=""></image>
<u-icon class="icon" name="checkmark-circle-fill" color="#2979FF" size="50"></u-icon>
<view class="price">
<view class="item" v-for="(item,index) in list" :key="index">
<image :src="item.thumbImageUrl" mode="widthFix"></image>
<view class="bottom">
<text class="text1">¥123</text>
<text class="text2">¥123</text>
<u-button class="button" size="mini" @click="payment">
点击付费下载
</u-button>
</view>
</view>
</view>
<view class="bottom" >
<view class="price">
<text class="text1">¥123</text>
<text class="text2">¥123</text>
</view>
<view class="btnn">
提交订单
</view>
</view>
</view>
</template>
<script>
......@@ -40,15 +33,14 @@ export default {
onReady() {//代替 vue 里面的 mounted
},
methods: {
pushImg(item){//添加相片到订单
// this.checkImg=item.thumbImageUrl
payment(){//付费下载
},
getPhotoData(){//获取用户vlog图片
this.$request("wechatUser/myPage/getVlogRecord", {
openid: uni.getStorageSync("openid"),
productType:1
}).then(res => {
console.log(res.data);
if (res.code === "00") {
this.list=res.data
}else{
......@@ -64,23 +56,16 @@ export default {
}
</script>
<style lang="scss" scoped>
.content{padding: 0 20rpx;box-sizing: border-box;margin: 0 auto;
.row{display: flex;width: 100%;justify-content: space-between;flex-wrap: wrap;padding-bottom: 100rpx;
.item{width: 48%;height: 220rpx;position: relative;margin-bottom: 20rpx;
image{width: 100%;height: 100%;border-radius: 10rpx;}
.icon{position: absolute;top: 5rpx;right: 5rpx;}
.price{position: absolute;bottom: 10rpx;right: 10rpx;font-weight: bold;
.content{box-sizing: border-box;margin: 0 auto;background-color: #fff;height: 100%;
.row{display: flex;width: 100%;justify-content: space-between;flex-wrap: wrap;
.item{width: 50%;position: relative;padding: 15rpx;
image{width: 100%;border-radius: 10rpx;}
.bottom{font-weight: bold;align-items: center;
.text1{font-size: 24rpx; text-decoration: line-through;color: #ccc;}
.text2{font-size: 32rpx;color: #EE520E;margin-left: 10rpx;}
.button{float: right;}
}
}
}
.bottom{border-top: 1rpx solid #e8e8e8;background-color: #fff; position: fixed;bottom: 0;width: 100%;height: 100rpx;right: 0;line-height: 100rpx;font-size: 32rpx;font-weight: bold;border-top-left-radius: 10rpx;border-top-right-radius: 10rpx;z-index: 10;
.btnn{float: right;width: 200rpx;background-color: #FFE600;border-radius: 10rpx;text-align: center;}
.price{font-weight: bold;float: left;padding-left: 20rpx;
.text1{font-size: 24rpx; text-decoration: line-through;color: #ccc;}
.text2{font-size: 32rpx;color: #EE520E;margin-left: 10rpx;}
}
}
}
</style>
\ No newline at end of file
<template>
<view class="content">
<view class="content" v-show="showBody">
<view class="top1" v-if="addressShow" @click="changeAddress">
<text style="float: left;">请填写收货地址</text>
<u-icon name="arrow-right" style="float: right;margin-top: 10upx;" color="#666666"></u-icon>
</view>
<view class="top" v-else @click="changeAddress">
<view class="address">
<u-icon name="map" style="margin-right: 10upx;"></u-icon>{{address.address}}
</view>
<view class="name">
<text
style="margin-right: 10upx;margin-left: 40upx;">{{address.name}}</text><text>{{address.phone}}</text>
</view>
<u-icon name="arrow-right" class="icon" color="#666666"></u-icon>
</view>
<image src="../../../static/img/vlog/icon/fengexian.png" mode=""
style="width: 110%;height: 10upx;margin-left: -20upx;"></image>
<view class="body">
<image :src="productVo.priceStockList[0].imgList[0].url"></image>
<view class="title">
<view>{{productVo.name}}</view>
<view class="price">{{ price}}</view>
</view>
</view>
<u-cell-group>
<u-cell-item title="商品金额" :value="'¥'+ price" :arrow="false"></u-cell-item>
<u-cell-item title="运费" :value="Freight.defaultCost==0?'包邮':'¥'+Freight.defaultCost" :arrow="false"></u-cell-item>
</u-cell-group>
<view class="bottom">
<view class="price">
{{allprice | money}}
</view>
<view class="confirm" @click="confirm">确认订单</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
return {
showBody: false,
price: "", //单价
allprice: "", //总价
productVo: {}, //当前的产品信息
address: {
name: "", //姓名
phone: "", //联系电话
address: "" //地址
}, //地址信息
addressShow: true,
Freight: {}, //手续费信息
}
},
onLoad(){//代替 vue 里面的 created
onLoad() { //created
this.productVo = uni.getStorageSync('productVo')
this.price = (this.productVo.priceStockList[0].sellingPrice * 1).toFixed(2)
this.getAddress()
},
onReady() {//代替 vue 里面的 mounted
onReady() { //mounted
},
methods: {
confirm() { //确认订单
if (this.address.name == '') {
return uni.showLoading({
title: '收件人不能为空!'
});
}
if (this.address.address == '') {
return uni.showLoading({
title: '收货地址不能为空!'
});
}
if (this.address.phone == '') {
return uni.showLoading({
title: '联系方式不能为空!'
});
}
let imgList = []
imgList = uni.getStorageSync('sortImglist')
let coverInside = uni.getStorageSync('coverInside')
imgList.push(uni.getStorageSync('coverInside').cover)
imgList.push(uni.getStorageSync('coverInside').inside)
let data = {
buyMethod: 1, //购买方式:1 单品购买,2套票、联票购买,3组合购买
cash: 0, //现金抵扣
companyId: "10001", //来源公司id(分销商Id)
orderMoney: this.allprice * 1, //订单总价 = 订单原价 - 优惠券价格 - 现金抵扣价格
orderProductList: [], //产品信息列表(单品购买为空,联票购买不为空,带有儿童票或者耳机的票不为空,组合购买不为空)
userId: uni.getStorageSync('openid'), //openid
orderSource: 1, //订单来源 1公众号平台、2公众号组合页面1、3公众号组合页面2、4胖丁伙伴app、5第三方自助机、6第三方票房窗口
orderType: 4, //订单类型(0其他,1景区,2酒店,3餐饮,4特产,5运营车,10组合订单)
ticketPhone: this.address.phone, //联系电话
orderProductVo: {
buyNum: 1, //购买数量
couponList: [],
cruisePlanId: "",
endPlayDate: this.$commonjs.today(),
endPlayTime: this.$commonjs.todayTime(),
isMaster: 0,
distributionPrice: this.price * 1, //分销商价格
merchantId: this.productVo.merchantId, //商户id
playDate: this.$commonjs.today(),
productId: this.productVo.id,
startPlayTime: this.$commonjs.todayTime(),
subOrderType: 0, //子订单类型(0、网络,1、扫码,2、自助机,3 组合,4、扫码支付,5、预订)
unitPrice: this.price * 1, //产品单价
orderImgList: imgList, //订单图片
postage: this.Freight.defaultCost * 1, //邮费
orderTouristList: [{ //用户收货地址信息
category: 0,
name: this.address.name,
touristAddress: this.address.address,
phone: this.address.phone
}],
}
}
uni.showLoading({
title: '订单创建中'
});
this.$request('orderc/order/createOrder', data).then(res => {
if (res.code == "00") {
this.$u.route("pages/orderPayment/orderPayment", {
orderId: res.data.id
})
uni.hideLoading();
} else {
uni.showModal({
showCancel: false,
title: '提示',
content: res.message,
});
}
})
},
changeAddress() { //跳转修改地址页面
this.$u.route("pages/vlog/shippingAddress/shippingAddress", this.address)
},
getAddress() { //获取收货地址
this.$request('wechatUser/contact/findContactList', {
openid: uni.getStorageSync("openid")
}).then(res => {
if (res.code == "00") {
this.address = res.data[0]
this.addressShow = false
this.getFreight()
} else {
uni.showModal({
showCancel: false,
title: '提示',
content: res.message,
});
}
})
},
getFreight() { //获取运费
this.$request('scenic/user/product/getProductPostage', {
id: this.productVo.id
}).then(res => {
if (res.code == "00") {
this.Freight = res.data
this.Freight.defaultCost = (this.Freight.defaultCost * 1).toFixed(2)
this.allprice = ((this.productVo.priceStockList[0].sellingPrice * 1) + (this.Freight
.defaultCost * 1))
this.showBody = true
} else {
uni.showModal({
showCancel: false,
title: '提示',
content: res.message,
});
}
})
},
}
}
</script>
<style lang="scss" scoped>
.content{padding: 0 20rpx;box-sizing: border-box;margin: 0 auto;}
.content {
padding: 0 20rpx;
box-sizing: border-box;
margin: 0 auto;
background-color: #fff;
}
.cell {
display: flex;
align-items: center;
height: 80upx;
line-height: 80upx;
border-bottom: 1upx solid #ccc;
text {
width: 20%;
margin-left: 30upx;
}
}
.top1 {
height: 50upx;
line-height: 50upx;
font-weight: bold;
}
.top {
height: 100upx;
position: relative;
padding-top: 10upx;
.name {
font-size: 28upx;
color: #666666;
line-height: 50upx;
}
.address {
font-size: 32upx;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
line-height: 50upx;
}
.icon {
line-height: 100upx;
position: absolute;
right: 0;
top: 40%;
}
}
.body {
display: flex;
margin-top: 20upx;
margin-bottom: 20upx;
image {
width: 240upx;
height: 240upx;
border-radius: 10upx;
}
.title {
width: 65%;
font-size: 36upx;
font-weight: bold;
padding: 20upx;
overflow: hidden;
display: flex;
flex-direction: column;
justify-content: space-between;
view {
text-overflow: ellipsis;
white-space: nowrap;
}
.price {
color: #3688FF;
}
}
}
.product_price {
display: flex;
justify-content: space-between;
font-size: 40upx;
font-weight: bold;
}
.yunfei {
display: flex;
justify-content: space-between;
font-size: 40upx;
font-weight: bold;
}
.bottom {
border-top: 1upx solid #e8e8e8;
height: 98upx;
position: fixed;
bottom: 0;
width: 100%;
right: 0;
font-size: 32rpx;
font-weight: bold;
display: flex;
align-items: center;
justify-content: space-between;
view {
display: inline-block;
}
.confirm {
height: 98upx;
background-color: #FFE600;
width: 200upx;
font-size: 32upx;
line-height: 98upx;
font-weight: bold;
float: right;
text-align: center;
}
.price {
color: #EE520E;
padding-left: 20upx;
}
}
</style>
......@@ -4,7 +4,7 @@
<u-icon name="bell-fill" color="#6C8EF3"></u-icon><text style="margin-left: 20rpx;">提醒:长按拖拽排序</text>
</view>
<view class="top">
<dragImg :listData="imgList" @change="changeImgList" :columns="4"></dragImg>
<dragImg :alternateImages="alternateImages" :listData="imgList" @change="changeImgList" :columns="3"></dragImg>
</view>
<view class="bottom" @click="next">
下一步
......@@ -20,57 +20,53 @@
},
data() {
return {
imgList: [{
images: '/static/images/swipe/1.png'
},
{
images: '/static/images/swipe/2.png'
},
{
images: '/static/images/swipe/3.png'
},
{
images: '/static/images/swipe/4.png'
},
{
images: '/static/images/swipe/5.png'
},
{
images: '/static/images/swipe/6.png'
},
{
images: '/static/images/swipe/7.png'
},
{
images: '/static/images/swipe/8.png'
},
{
images: '/static/images/swipe/9.png'
},
{
images: '/static/images/swipe/10.png'
}
],
sortImglist:[]
alternateImages:[],//备选图片
imgList: [],//已选择图片
sortImglist:[]//排序后图片
}
},
onLoad() { //代替 vue 里面的 created
var allImgList=uni.getStorageSync('imgList')
var allImgList1=JSON.parse(JSON.stringify(allImgList))
allImgList.forEach(item=>{//备选图片
var obj={
images:item.url
}
this.alternateImages.push(obj)
})
allImgList1.forEach(item=>{//已选择图片
if(item.check===1){
var obj={
images:item.url
}
this.imgList.push(obj)
}
})
},
onReady() { //代替 vue 里面的 mounted
this.imgList.forEach((item,index)=>{//处理数据并保存初始顺序
let obj={
imgName:index,
imgUrl:item.images
}
this.sortImglist.push(obj)
})
uni.setStorageSync("sortImglist",this.sortImglist)
},
methods: {
changeImgList(res) {
this.sortImglist=res.listData
},
next(){//下一步
// 此为uView的跳转方法,详见"文档-JS"部分,也可以用uni的uni.navigateTo
this.$u.route({
// 关于此路径,请见下方"注意事项"
url:"pages/vlog/orderPay/orderPay",
// 内部已设置以下默认参数值,可不传这些参数
params: {
changeImgList(res) {//接收子组件传递数据更改排序
this.sortImglist=[]
res.listData.forEach((item,index)=>{
let obj={
imgName:index,
imgUrl:item.images
}
this.sortImglist.push(obj)
})
uni.setStorageSync("sortImglist",this.sortImglist)
},
next(){//下一步
this.$u.route("pages/vlog/orderPay/orderPay")
}
}
}
......@@ -89,10 +85,10 @@
color: #ABABAB;
background-color: #fff;
position: fixed;top: 0;z-index: 10;
border-bottom: 1upx dashed #ccc;
}
.top{
margin-top: 50rpx;
border-top: 1px dashed #ccc;
margin-bottom: 100rpx;
}
.bottom{position: fixed;bottom: 0;width: 100%;height: 100rpx;background-color:#FFE600;right: 0;line-height: 100rpx;font-size: 32rpx;font-weight: bold;border-top-left-radius: 10rpx;border-top-right-radius: 10rpx;z-index: 10;text-align: center;}
......
<template>
<view class="content">
<view class="item" style="padding: 20rpx 0;height: 220rpx;">
<image src="https://cdn.uviewui.com/uview/swiper/1.jpg"></image>
<view class="item" style="padding-bottom: 0;">
<image src="../../../static/img/vlog/product_fengmian.jpg" mode="widthFix"></image>
<view class="title">
<view>我的VLOG照片</view>
<navigator url="../myVlogPhotos/myVlogPhotos" class="btnn" style="margin-top: 50rpx;">
......@@ -11,7 +11,7 @@
</view>
<block v-for="(item,index) in list" :key="index">
<view class="item">
<image :src="item.imgUrl"></image>
<image :src="item.imgUrl" style="height: 230rpx;"></image>
<view class="title">
<text>{{item.name}}</text>
<view style="margin: 15rpx 0;">
......@@ -23,7 +23,7 @@
</navigator>
</view>
<view class="guige" v-if="item.priceStockList[0].standardName">
规格:{{item.priceStockList[0].standardName || ""}}
规格:{{item.priceStockList[0].standardName || ""}}
</view>
</view>
</block>
......@@ -63,13 +63,13 @@ export default {
}
</script>
<style lang="scss" scoped>
.content{padding: 0 20rpx;box-sizing: border-box;margin: 0 auto;
.item{display: flex;justify-content: space-between;padding: 40rpx 0;height: 260rpx;position: relative;
image{width: 48%;height: 100%; border-radius: 10rpx;}
.title{width: 48%;height: 100%;text-align: center;font-weight: bold;
.content{padding: 0 20rpx;box-sizing: border-box;margin: 0 auto;background-color: #fff;height: 100%;
.item{display: flex;justify-content: space-between;padding: 40rpx 0;position: relative;width: 100%;align-items: center;
image{width: 55%;border-radius: 10rpx;}
.title{width: 40%;text-align: center;font-weight: bold;
.btnn {display: inline-block;border-radius: 15rpx;background-color: #FFE600;font-weight: bold;padding: 15rpx 20rpx;}
}
.guige{position: absolute;bottom: 0;left: 13%;color: #999999;}
.guige{position: absolute;color: #999999;height: 16rpx;line-height: 16rpx;bottom: 8rpx;left: 20%;}
}
}
.noprice{font-size: 24rpx; text-decoration: line-through;color: #ccc;}
......
<template>
<view class="content">
<view class="item">
<image :src="productVo.priceStockList[0].imgList[0].url"></image>
<view class="title" style="padding-top: 35rpx;">
<text>规格:{{productVo.priceStockList[0].standardName || ""}}</text>
<view style="margin-top: 30rpx;">
<text class="noprice">¥{{productVo.priceStockList[0].originalPrice || ""}}</text>
<text class="price">¥{{productVo.priceStockList[0].sellingPrice || ""}}</text>
<view v-if="showBody">
<view class="item">
<image :src="productVo.priceStockList[0].imgList[0].url"></image>
<view class="title" style="padding-top: 35rpx;">
<text>规格: <text
v-if="productVo.priceStockList[0].standardName">{{productVo.priceStockList[0].standardName}}</text></text>
<view style="margin-top: 30rpx;">
<text class="noprice">¥{{productVo.priceStockList[0].originalPrice || ""}}</text>
<text class="price">¥{{productVo.priceStockList[0].sellingPrice || ""}}</text>
</view>
</view>
</view>
</view>
<view class="" style="display: flex;">
<u-section title="模板选择" :right="false" color="#303133"></u-section><text style="font-size: 24rpx;color: #ccc;margin-left: 30rpx;">Template Selection</text>
</view>
<image src="../../../static/img/vlog/icon/fengexian.png" mode="" style="width: 100%;height: 15rpx;"></image>
<view style="display: flex;justify-content: space-around;margin-top: 20rpx;">
<button type="default" class="btnn" :class="current===0?'active':'noactive'" @click="current=0">封面</button>
<button type="default" class="btnn" :class="current===1?'active':'noactive'" @click="current=1">内页</button>
</view>
<view v-if="current===0">
<view class="cover">
<view class="coverItem" v-for="(item,index) in imgList2" :key="index">
<image class="img" :src="item.url" mode="" @click="changeCover(item.url)"></image>
<u-icon v-if="cover===item.url" class="icon" name="checkmark-circle-fill" color="#2979FF" size="50"></u-icon>
<view class="" style="display: flex;">
<u-section title="模板选择" :right="false" color="#303133"></u-section>
<text style="font-size: 24rpx;color: #ccc;margin-left: 30rpx;">Template Selection</text>
</view>
<image src="../../../static/img/vlog/icon/fengexian.png" style="width: 100%;height: 15rpx;"></image>
<view style="display: flex;justify-content: space-around;margin-bottom: 20upx;width: 75%;margin: 20upx auto;">
<button type="default" class="btnn" :class="current===0?'active':'noactive'"
@click="current=0">封面</button>
<button type="default" class="btnn" :class="current===1?'active':'noactive'"
@click="current=1">内页</button>
</view>
<view v-if="current===0">
<view class="cover">
<view class="coverItem1" v-for="(item,index) in imgList2" :key="index">
<image class="img" :src="item.url" @click="changeCover(item.url)"></image>
<image v-if="cover===item.url" src="../../../static/img/vlog/icon/check.png" class="icon"></image>
</view>
</view>
</view>
</view>
<view class="" v-else>
<view class="cover">
<view class="coverItem" v-for="(item,index) in imgList3" :key="index">
<image class="img" :src="item.url" mode="" @click="changeinsidePages(item.url)"></image>
<u-icon v-if="insidePages===item.url" class="icon" name="checkmark-circle-fill" color="#2979FF" size="50"></u-icon>
<view v-else>
<view class="cover">
<view class="coverItem" v-for="(item,index) in imgList3" :key="index">
<image class="img" :src="item.url" @click="changeinsidePages(item.url)"></image>
<image v-if="insidePages===item.url" src="../../../static/img/vlog/icon/check.png" class="icon"></image>
</view>
</view>
</view>
<view style="display: flex;margin-top: 30rpx;">
<u-section title="详细参数" :right="false" color="#303133"></u-section>
<text style="font-size: 24rpx;color: #ccc;margin-left: 30rpx;">Parameters</text>
</view>
<image src="../../../static/img/vlog/icon/fengexian.png" mode="" style="width: 100%;height: 15rpx;"></image>
<image :src="item.url" mode="widthFix" v-for="(item,index) in imgList1" :key="index" style="width: 100%;border-radius: 10rpx;"></image>
<view class="bottom" @click="beginMaking">上传照片制作</view>
</view>
<view v-else>
<view style="display: flex;margin-top: 30rpx;">
<u-section title="详细参数" :right="false" color="#303133"></u-section><text style="font-size: 24rpx;color: #ccc;margin-left: 30rpx;">Parameters</text>
</view>
<image src="../../../static/img/vlog/icon/fengexian.png" mode="" style="width: 100%;height: 15rpx;"></image>
<image :src="item.url" mode="widthFix" v-for="(item,index) in imgList1" :key="index" style="width: 100%;border-radius: 10rpx;"></image>
<view class="bottom" @click="beginMaking">
上传照片制作
</view>
</view>
</template>
......@@ -49,10 +56,11 @@
export default {
data() {
return {
productVo:{},//产品详情
imgList1:[],//详情列表
imgList2:[],//封面列表
imgList3:[],//内页列表
showBody: false,
productVo: {}, //产品详情
imgList1: [], //详情列表
imgList2: [], //封面列表
imgList3: [], //内页列表
current: 0, //封面内页切换
cover: "", //封面
insidePages: "", //内页
......@@ -74,15 +82,17 @@
openid: uni.getStorageSync("openid")
}).then(res => {
if (res.code === "00") {
this.productVo=res.data.productVo
res.data.productVo.imgList.forEach(item=>{
if(item.location===5){
this.showBody = true
this.productVo = res.data.productVo
uni.setStorageSync('productVo', this.productVo) //保存选择的商品信息
res.data.productVo.imgList.forEach(item => {
if (item.location === 5) {
this.imgList1.push(item)
}
if(item.location===6){
if (item.location === 6) {
this.imgList2.push(item)
}
if(item.location===8){
if (item.location === 8) {
this.imgList3.push(item)
}
})
......@@ -104,22 +114,32 @@
beginMaking() {
if (this.cover === "") {
return uni.showModal({
showCancel: false,
title: '提示',
content: '请选择封面',
});
}
if (this.insidePages === "") {
return uni.showModal({
showCancel: false,
title: '提示',
content: '请选择内页',
});
}
this.$u.route({
url: 'pages/vlog/uploadPictures/uploadPictures',
params: {
cover: this.cover,
insidePages: this.insidePages
let coverInside = {
cover: {
imgName: '封面',
imgUrl: this.cover
},
inside: {
imgName: '内页',
imgUrl: this.insidePages
}
}
uni.setStorageSync('coverInside', coverInside)
let yeshu = this.productVo.priceStockList[0].standardName
this.$u.route({
url: 'pages/vlog/uploadPictures/uploadPictures?yeshu=' + yeshu
})
}
}
......@@ -135,19 +155,22 @@
.item {
display: flex;
justify-content: space-between;
padding: 30rpx 20rpx 20rpx 20rpx;
padding: 15rpx 56rpx 52rpx 15rpx;
image {
width: 48%;
height: 220rpx;
width: 412rpx;
height: 288rpx;
border-radius: 10rpx;
box-shadow: 0px 0px 16px rgba(0, 0, 0, 0.08);
}
.title {
color: #999999;
font-size: 28upx;
width: 48%;
height: 220rpx;
padding-top: 10rpx;
margin-top: 20rpx;
margin-top: 60rpx;
}
}
......@@ -168,13 +191,15 @@
.cover {
display: flex;
flex-wrap: wrap;
justify-content: space-between;
justify-content: space-around;
padding-bottom: 40upx;
.coverItem {
width: 48.5%;
height: 220rpx;
width: 328upx;
height: 231upx;
position: relative;
padding-top: 20rpx;
margin-top: 20rpx;
box-shadow: 0px 0px 16px rgba(0, 0, 0, 0.08);
.img {
width: 100%;
......@@ -183,9 +208,33 @@
}
.icon {
width: 40rpx;
height: 40rpx;
position: absolute;
top: 10rpx;
right: 10rpx;
}
}
.coverItem1 {
width: 556upx;
height: 396upx;
margin: 0 auto;
position: relative;
margin-top: 20rpx;
box-shadow: 0px 0px 16px rgba(0, 0, 0, 0.08);
.img {
width: 100%;
height: 100%;
border-radius: 10rpx;
}
.icon {
width: 40rpx;
height: 40rpx;
position: absolute;
top: 25rpx;
right: 5rpx;
top: 10rpx;
right: 10rpx;
}
}
}
......@@ -194,11 +243,11 @@
position: fixed;
bottom: 0;
width: 100%;
height: 100rpx;
height: 98rpx;
background-color: #FFE600;
right: 0;
line-height: 100rpx;
font-size: 32rpx;
font-size: 36rpx;
font-weight: bold;
border-top-left-radius: 10rpx;
border-top-right-radius: 10rpx;
......@@ -207,10 +256,10 @@
.btnn {
background-color: #ECF4FF;
width: 25%;
height: 60rpx;
line-height: 60rpx;
font-size: 26rpx;
width: 180upx;
height: 64rpx;
line-height: 64rpx;
font-size: 28rpx;
}
.active {
......
......@@ -2,12 +2,12 @@
<view class="content">
<view style="padding-top: 30rpx;">
<block>
<view class="item">
<view class="item" v-if="scenic.name">
<video class="video" :poster="scenic.coverImgUrl" :src="scenic.showVideoUrl" play-btn-position="center" @error="error" controls></video>
<view class="title">
<text>[ {{scenic.name || ""}} ]</text>
<view>
<u-icon name="eye-fill" class="icon" color="#ffffff" size="40rpx"></u-icon><text style="color: #ffffff;">10W+</text>
<u-icon name="eye-fill" class="icon" color="#ffffff" size="40rpx"></u-icon><text style="color: #ffffff;" space>10W +</text>
</view>
</view>
</view>
......
<template>
<view class="content">
<view class="cell">
<text>收件人</text>
<u-input v-model="address.name" :type="type" :border="border" placeholder="请输入收件人姓名" :clearable="false" />
</view>
<view class="cell">
<text>联系电话</text>
<u-input v-model="address.phone" :type="type" :border="border" placeholder="请输入联系电话" :clearable="false" />
</view>
<view class="cell">
<text>收货地址</text>
<u-input v-model="address.address" :type="type" :border="border" placeholder="请输入收货地址" :clearable="false" />
</view>
<view style="margin: 100upx auto;width: 30%;">
<u-button type="success" @click="baocun">保存</u-button>
</view>
</view>
</template>
<script>
export default {
data() {
return {
address: {
name: "", //姓名
phone: "", //联系电话
address: "" //地址
} //地址信息
}
},
onLoad(opction) { //代替 vue 里面的 created
this.address = opction
},
onReady() { //代替 vue 里面的 mounted
},
methods: {
baocun() { //保存收货地址
if (this.$u.test.mobile(this.address.phone)) { //手机号验证
let data = {
id: this.address.id,
name: this.address.name,
phone: this.address.phone,
address: this.address.address,
openid: uni.getStorageSync('openid')
}
this.$request('wechatUser/contact/updateContact', data).then(res => {
if (res.code == '00') { //保存成功后跳转
this.$u.route("pages/vlog/orderPay/orderPay")
uni.showToast({
title: '保存成功',
duration: 1000
});
}else{
uni.showModal({
showCancel: false,
title: '提示',
content: res.message,
});
}
})
} else {
uni.showModal({
showCancel: false,
title: '提示',
content: "请正确输入手机号!",
});
}
},
}
}
</script>
<style lang="scss" scoped>
.content {
padding: 0 20rpx;
box-sizing: border-box;
margin: 0 auto;
}
.cell {
display: flex;
align-items: center;
height: 80upx;
line-height: 80upx;
border-bottom: 1upx solid #ccc;
text {
width: 20%;
margin-left: 30upx;
}
}
</style>
......@@ -9,8 +9,7 @@
@touchend="touchEnd"
:style="{ width: cropperOpt.width, height: cropperOpt.height, backgroundColor: 'rgba(0, 0, 0, 0.8)' }"
canvas-id="cropper"
id="cropper"
></canvas>
id="cropper"></canvas>
<canvas
class="cropper"
:disable-scroll="true"
......
......@@ -866,7 +866,6 @@
width: width,
height: height
};
var task = function() {
return Promise.resolve();
};
......
......@@ -4,7 +4,7 @@
<u-search placeholder="景区/关键词搜索" v-model="search" :clearabled="true" @search="query" :show-action="true"
action-text="搜索" :animation="true"></u-search>
<view class="swiper">
<u-swiper :list="list"></u-swiper>
<u-swiper :list="list" height="380"></u-swiper>
</view>
<view class="title">
<view class="shuxian"></view>
......@@ -69,13 +69,13 @@
scenicList: [], //景区列表
search: "", //景区
list: [{
image: 'https://cdn.uviewui.com/uview/swiper/1.jpg'
image: '../../../static/img/vlog/swipe/swipe1.jpg'
},
{
image: 'https://cdn.uviewui.com/uview/swiper/2.jpg'
image: '../../../static/img/vlog/swipe/swipe2.jpg'
},
{
image: 'https://cdn.uviewui.com/uview/swiper/3.jpg'
image: '../../../static/img/vlog/swipe/swipe3.jpg'
}
],
}
......@@ -135,14 +135,12 @@
}
this.$request("distribution/vlog/vlogRegister", data).then(res => { //注册
if (res.code === "00") {
console.log("注册成功");
let data = {
userId: uni.getStorageSync("openid"),
action: "VLOG_DOWNLOAD"
}
this.$request("distribution/vlog/backflow", data).then(res => { //埋点
if (res.code === "00") {
console.log("埋点成功");
}
})
}
......@@ -152,7 +150,6 @@
uni.authorize({ //摄像头
scope: 'scope.camera',
success: (res) => {
console.log('摄像头已打开');
},
fail: (res) => {
uni.showModal({
......@@ -181,7 +178,6 @@
uni.authorize({
scope: 'scope.writePhotosAlbum',
success: (res) => {
console.log('相册权限已打开');
},
fail: (res) => {
uni.showModal({
......@@ -242,7 +238,7 @@
}
.photoGallery {
height: 150rpx;
height: 180rpx;
border-radius: 10rpx;
background-color: #212B44;
margin-top: 20rpx;
......
{"version":3,"sources":["uni-app:///main.js","webpack:///E:/pangding/uni-pdtravel/pages/vlog/photoAlbum/photoAlbum.vue?ffd5","webpack:///E:/pangding/uni-pdtravel/pages/vlog/photoAlbum/photoAlbum.vue?24db","webpack:///E:/pangding/uni-pdtravel/pages/vlog/photoAlbum/photoAlbum.vue?8c95","webpack:///E:/pangding/uni-pdtravel/pages/vlog/photoAlbum/photoAlbum.vue?0262","uni-app:///pages/vlog/photoAlbum/photoAlbum.vue","webpack:///E:/pangding/uni-pdtravel/pages/vlog/photoAlbum/photoAlbum.vue?aeeb","webpack:///E:/pangding/uni-pdtravel/pages/vlog/photoAlbum/photoAlbum.vue?2111"],"names":["createPage","Page"],"mappings":";;;;;;;;;;kDAAA,wCAAmB;AACnB;AACA,iH;AACAA,UAAU,CAACC,mBAAD,CAAV,C;;;;;;;;;;;;;ACHA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAmI;AACnI;AAC8D;AACL;AACsC;;;AAG/F;AAC2K;AAC3K,gBAAgB,+KAAU;AAC1B,EAAE,gFAAM;AACR,EAAE,iGAAM;AACR,EAAE,0GAAe;AACjB;AACA;AACA;AACA;AACA;AACA,EAAE,qGAAU;AACZ;AACA;;AAEA;AACe,gF;;;;;;;;;;;;ACvBf;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;;;;;;;;;;;ACAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;;;;;;ACRA;AAAA;AAAA;AAAA;AAAkoB,CAAgB,8nBAAG,EAAC,C;;;;;;;;;;;;;;;;;ACKtpB;AACA,MADA,kBACA;AACA;;AAEA,GAJA;AAKA,QALA,oBAKA;AACA,GANA;AAOA,SAPA,qBAOA;AACA,GARA;AASA,aATA,E;;;;;;;;;;;;ACLA;AAAA;AAAA;AAAA;AAAorC,CAAgB,wmCAAG,EAAC,C;;;;;;;;;;;ACAxsC;AACA,OAAO,KAAU,EAAE,kBAKd","file":"pages/vlog/photoAlbum/photoAlbum.js","sourcesContent":["import 'uni-pages';import '@dcloudio/uni-stat';\nimport Vue from 'vue'\nimport Page from './pages/vlog/photoAlbum/photoAlbum.vue'\ncreatePage(Page)","import { render, staticRenderFns, recyclableRender, components } from \"./photoAlbum.vue?vue&type=template&id=0655d147&scoped=true&\"\nvar renderjs\nimport script from \"./photoAlbum.vue?vue&type=script&lang=js&\"\nexport * from \"./photoAlbum.vue?vue&type=script&lang=js&\"\nimport style0 from \"./photoAlbum.vue?vue&type=style&index=0&id=0655d147&lang=scss&scoped=true&\"\n\n\n/* normalize component */\nimport normalizer from \"!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\vue-cli-plugin-uni\\\\packages\\\\vue-loader\\\\lib\\\\runtime\\\\componentNormalizer.js\"\nvar component = normalizer(\n script,\n render,\n staticRenderFns,\n false,\n null,\n \"0655d147\",\n null,\n false,\n components,\n renderjs\n)\n\ncomponent.options.__file = \"pages/vlog/photoAlbum/photoAlbum.vue\"\nexport default component.exports","export * from \"-!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\vue-cli-plugin-uni\\\\packages\\\\vue-loader\\\\lib\\\\loaders\\\\templateLoader.js??vue-loader-options!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\vue-cli-plugin-uni\\\\packages\\\\webpack-preprocess-loader\\\\index.js??ref--16-0!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\webpack-uni-mp-loader\\\\lib\\\\template.js!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\vue-cli-plugin-uni\\\\packages\\\\webpack-uni-app-loader\\\\page-meta.js!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\vue-cli-plugin-uni\\\\packages\\\\vue-loader\\\\lib\\\\index.js??vue-loader-options!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\webpack-uni-mp-loader\\\\lib\\\\style.js!./photoAlbum.vue?vue&type=template&id=0655d147&scoped=true&\"","var components\nvar render = function() {\n var _vm = this\n var _h = _vm.$createElement\n var _c = _vm._self._c || _h\n}\nvar recyclableRender = false\nvar staticRenderFns = []\nrender._withStripped = true\n\nexport { render, staticRenderFns, recyclableRender, components }","import mod from \"-!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\babel-loader\\\\lib\\\\index.js!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\vue-cli-plugin-uni\\\\packages\\\\webpack-preprocess-loader\\\\index.js??ref--12-1!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\webpack-uni-mp-loader\\\\lib\\\\script.js!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\vue-cli-plugin-uni\\\\packages\\\\vue-loader\\\\lib\\\\index.js??vue-loader-options!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\webpack-uni-mp-loader\\\\lib\\\\style.js!./photoAlbum.vue?vue&type=script&lang=js&\"; export default mod; export * from \"-!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\babel-loader\\\\lib\\\\index.js!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\vue-cli-plugin-uni\\\\packages\\\\webpack-preprocess-loader\\\\index.js??ref--12-1!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\webpack-uni-mp-loader\\\\lib\\\\script.js!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\vue-cli-plugin-uni\\\\packages\\\\vue-loader\\\\lib\\\\index.js??vue-loader-options!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\webpack-uni-mp-loader\\\\lib\\\\style.js!./photoAlbum.vue?vue&type=script&lang=js&\"","<template>\r\n <view class=\"content\">\r\n\t</view>\r\n</template>\r\n<script>\r\nexport default {\r\n data() {\r\n return {\r\n\t\t}\r\n },\r\n\tonLoad(){//代替 vue 里面的 created\r\n\t},\r\n\tonReady() {//代替 vue 里面的 mounted\r\n\t},\r\n methods: {\r\n\t}\r\n}\r\n</script>\r\n<style lang=\"scss\" scoped>\r\n\t.content{padding: 0 20rpx;box-sizing: border-box;margin: 0 auto;}\r\n</style>","import mod from \"-!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\mini-css-extract-plugin\\\\dist\\\\loader.js??ref--8-oneOf-1-0!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\css-loader\\\\dist\\\\cjs.js??ref--8-oneOf-1-1!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\vue-cli-plugin-uni\\\\packages\\\\vue-loader\\\\lib\\\\loaders\\\\stylePostLoader.js!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\vue-cli-plugin-uni\\\\packages\\\\webpack-preprocess-loader\\\\index.js??ref--8-oneOf-1-2!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\postcss-loader\\\\src\\\\index.js??ref--8-oneOf-1-3!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\sass-loader\\\\dist\\\\cjs.js??ref--8-oneOf-1-4!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\vue-cli-plugin-uni\\\\packages\\\\webpack-preprocess-loader\\\\index.js??ref--8-oneOf-1-5!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\vue-cli-plugin-uni\\\\packages\\\\vue-loader\\\\lib\\\\index.js??vue-loader-options!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\webpack-uni-mp-loader\\\\lib\\\\style.js!./photoAlbum.vue?vue&type=style&index=0&id=0655d147&lang=scss&scoped=true&\"; export default mod; export * from \"-!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\mini-css-extract-plugin\\\\dist\\\\loader.js??ref--8-oneOf-1-0!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\css-loader\\\\dist\\\\cjs.js??ref--8-oneOf-1-1!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\vue-cli-plugin-uni\\\\packages\\\\vue-loader\\\\lib\\\\loaders\\\\stylePostLoader.js!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\vue-cli-plugin-uni\\\\packages\\\\webpack-preprocess-loader\\\\index.js??ref--8-oneOf-1-2!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\postcss-loader\\\\src\\\\index.js??ref--8-oneOf-1-3!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\sass-loader\\\\dist\\\\cjs.js??ref--8-oneOf-1-4!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\vue-cli-plugin-uni\\\\packages\\\\webpack-preprocess-loader\\\\index.js??ref--8-oneOf-1-5!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\vue-cli-plugin-uni\\\\packages\\\\vue-loader\\\\lib\\\\index.js??vue-loader-options!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\webpack-uni-mp-loader\\\\lib\\\\style.js!./photoAlbum.vue?vue&type=style&index=0&id=0655d147&lang=scss&scoped=true&\"","// extracted by mini-css-extract-plugin\n if(module.hot) {\n // 1634804144228\n var cssReload = require(\"D:/程序应用/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/hmr/hotModuleReplacement.js\")(module.id, {\"hmr\":true,\"publicPath\":\"../../\",\"locals\":false});\n module.hot.dispose(cssReload);\n module.hot.accept(undefined, cssReload);\n }\n "],"sourceRoot":""}
\ No newline at end of file
{"version":3,"sources":["uni-app:///main.js","webpack:///E:/pangding/uni-pdtravel/pages/vlog/share/share.vue?5ae3","webpack:///E:/pangding/uni-pdtravel/pages/vlog/share/share.vue?d11d","webpack:///E:/pangding/uni-pdtravel/pages/vlog/share/share.vue?3d3c","webpack:///E:/pangding/uni-pdtravel/pages/vlog/share/share.vue?0cd6","uni-app:///pages/vlog/share/share.vue","webpack:///E:/pangding/uni-pdtravel/pages/vlog/share/share.vue?ca77","webpack:///E:/pangding/uni-pdtravel/pages/vlog/share/share.vue?432a"],"names":["createPage","Page"],"mappings":";;;;;;;;;;kDAAA,wCAAmB;AACnB;AACA,kG;AACAA,UAAU,CAACC,cAAD,CAAV,C;;;;;;;;;;;;;ACHA;AAAA;AAAA;AAAA;AAAA;AAAA;AAA8H;AAC9H;AACyD;AACL;AACsC;;;AAG1F;AAC2K;AAC3K,gBAAgB,+KAAU;AAC1B,EAAE,2EAAM;AACR,EAAE,4FAAM;AACR,EAAE,qGAAe;AACjB;AACA;AACA;AACA;AACA;AACA,EAAE,gGAAU;AACZ;AACA;;AAEA;AACe,gF;;;;;;;;;;;;ACvBf;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;;;;;;;;;;;ACAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;;;;;;ACRA;AAAA;AAAA;AAAA;AAA6nB,CAAgB,ynBAAG,EAAC,C;;;;;;;;;;;;;;;;;;;;;;ACUjpB;AACA,MADA,kBACA;AACA;AACA,aADA;;AAGA,GALA;AAMA,QANA,oBAMA;;AAEA;AACA;AACA;;AAEA,GAZA;AAaA,QAbA,kBAaA,GAbA,EAaA;AACA;AACA;AACA,GAhBA;AAiBA,aAjBA,E;;;;;;;;;;;;ACVA;AAAA;AAAA;AAAA;AAA+qC,CAAgB,mmCAAG,EAAC,C;;;;;;;;;;;ACAnsC;AACA,OAAO,KAAU,EAAE,kBAKd","file":"pages/vlog/share/share.js","sourcesContent":["import 'uni-pages';import '@dcloudio/uni-stat';\nimport Vue from 'vue'\nimport Page from './pages/vlog/share/share.vue'\ncreatePage(Page)","import { render, staticRenderFns, recyclableRender, components } from \"./share.vue?vue&type=template&id=058075a7&scoped=true&\"\nvar renderjs\nimport script from \"./share.vue?vue&type=script&lang=js&\"\nexport * from \"./share.vue?vue&type=script&lang=js&\"\nimport style0 from \"./share.vue?vue&type=style&index=0&id=058075a7&lang=scss&scoped=true&\"\n\n\n/* normalize component */\nimport normalizer from \"!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\vue-cli-plugin-uni\\\\packages\\\\vue-loader\\\\lib\\\\runtime\\\\componentNormalizer.js\"\nvar component = normalizer(\n script,\n render,\n staticRenderFns,\n false,\n null,\n \"058075a7\",\n null,\n false,\n components,\n renderjs\n)\n\ncomponent.options.__file = \"pages/vlog/share/share.vue\"\nexport default component.exports","export * from \"-!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\vue-cli-plugin-uni\\\\packages\\\\vue-loader\\\\lib\\\\loaders\\\\templateLoader.js??vue-loader-options!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\vue-cli-plugin-uni\\\\packages\\\\webpack-preprocess-loader\\\\index.js??ref--16-0!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\webpack-uni-mp-loader\\\\lib\\\\template.js!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\vue-cli-plugin-uni\\\\packages\\\\webpack-uni-app-loader\\\\page-meta.js!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\vue-cli-plugin-uni\\\\packages\\\\vue-loader\\\\lib\\\\index.js??vue-loader-options!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\webpack-uni-mp-loader\\\\lib\\\\style.js!./share.vue?vue&type=template&id=058075a7&scoped=true&\"","var components\nvar render = function() {\n var _vm = this\n var _h = _vm.$createElement\n var _c = _vm._self._c || _h\n}\nvar recyclableRender = false\nvar staticRenderFns = []\nrender._withStripped = true\n\nexport { render, staticRenderFns, recyclableRender, components }","import mod from \"-!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\babel-loader\\\\lib\\\\index.js!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\vue-cli-plugin-uni\\\\packages\\\\webpack-preprocess-loader\\\\index.js??ref--12-1!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\webpack-uni-mp-loader\\\\lib\\\\script.js!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\vue-cli-plugin-uni\\\\packages\\\\vue-loader\\\\lib\\\\index.js??vue-loader-options!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\webpack-uni-mp-loader\\\\lib\\\\style.js!./share.vue?vue&type=script&lang=js&\"; export default mod; export * from \"-!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\babel-loader\\\\lib\\\\index.js!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\vue-cli-plugin-uni\\\\packages\\\\webpack-preprocess-loader\\\\index.js??ref--12-1!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\webpack-uni-mp-loader\\\\lib\\\\script.js!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\vue-cli-plugin-uni\\\\packages\\\\vue-loader\\\\lib\\\\index.js??vue-loader-options!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\webpack-uni-mp-loader\\\\lib\\\\style.js!./share.vue?vue&type=script&lang=js&\"","<template>\r\n\t<view class=\"content\">\r\n\t\t<video v-if=\"url\" class=\"video\" :src=\"url\" controls></video>\r\n\t\t<navigator url=\"../vlogIndex/vlogIndex\">\r\n\t\t\t<button type=\"default\">vlog首页</button>\r\n\t\t</navigator>\r\n\t</view>\r\n</template>\r\n\r\n<script>\r\n\texport default {\r\n\t\tdata() {\r\n\t\t\treturn {\r\n\t\t\t\turl:\"\"\r\n\t\t\t}\r\n\t\t},\r\n\t\tonShow() {\r\n\t\t\t// #ifdef MP-WEIXIN \r\n\t\t\tif(wx.hideHomeButton){//隐藏返回首页按钮\r\n\t\t\t wx.hideHomeButton(); \r\n\t\t\t} \r\n\t\t\t// #endif\r\n\t\t},\r\n\t\tonLoad(res){\r\n\t\t\tconsole.log(res);\r\n\t\t\tthis.url=res.url\r\n\t\t},\r\n\t\tmethods: {\r\n\t\t\t\r\n\t\t}\r\n\t}\r\n</script>\r\n\r\n<style lang=\"scss\" scoped>\r\n\t.content{padding: 0 20rpx;box-sizing: border-box;margin: 0 auto;\r\n\t\t.video{height: 350rpx;border-radius: 10rpx;width: 100%;}\r\n\t}\r\n</style>\r\n","import mod from \"-!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\mini-css-extract-plugin\\\\dist\\\\loader.js??ref--8-oneOf-1-0!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\css-loader\\\\dist\\\\cjs.js??ref--8-oneOf-1-1!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\vue-cli-plugin-uni\\\\packages\\\\vue-loader\\\\lib\\\\loaders\\\\stylePostLoader.js!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\vue-cli-plugin-uni\\\\packages\\\\webpack-preprocess-loader\\\\index.js??ref--8-oneOf-1-2!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\postcss-loader\\\\src\\\\index.js??ref--8-oneOf-1-3!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\sass-loader\\\\dist\\\\cjs.js??ref--8-oneOf-1-4!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\vue-cli-plugin-uni\\\\packages\\\\webpack-preprocess-loader\\\\index.js??ref--8-oneOf-1-5!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\vue-cli-plugin-uni\\\\packages\\\\vue-loader\\\\lib\\\\index.js??vue-loader-options!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\webpack-uni-mp-loader\\\\lib\\\\style.js!./share.vue?vue&type=style&index=0&id=058075a7&lang=scss&scoped=true&\"; export default mod; export * from \"-!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\mini-css-extract-plugin\\\\dist\\\\loader.js??ref--8-oneOf-1-0!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\css-loader\\\\dist\\\\cjs.js??ref--8-oneOf-1-1!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\vue-cli-plugin-uni\\\\packages\\\\vue-loader\\\\lib\\\\loaders\\\\stylePostLoader.js!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\vue-cli-plugin-uni\\\\packages\\\\webpack-preprocess-loader\\\\index.js??ref--8-oneOf-1-2!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\postcss-loader\\\\src\\\\index.js??ref--8-oneOf-1-3!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\sass-loader\\\\dist\\\\cjs.js??ref--8-oneOf-1-4!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\vue-cli-plugin-uni\\\\packages\\\\webpack-preprocess-loader\\\\index.js??ref--8-oneOf-1-5!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\vue-cli-plugin-uni\\\\packages\\\\vue-loader\\\\lib\\\\index.js??vue-loader-options!D:\\\\程序应用\\\\HBuilderX\\\\plugins\\\\uniapp-cli\\\\node_modules\\\\@dcloudio\\\\webpack-uni-mp-loader\\\\lib\\\\style.js!./share.vue?vue&type=style&index=0&id=058075a7&lang=scss&scoped=true&\"","// extracted by mini-css-extract-plugin\n if(module.hot) {\n // 1634804144240\n var cssReload = require(\"D:/程序应用/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/hmr/hotModuleReplacement.js\")(module.id, {\"hmr\":true,\"publicPath\":\"../../\",\"locals\":false});\n module.hot.dispose(cssReload);\n module.hot.accept(undefined, cssReload);\n }\n "],"sourceRoot":""}
\ No newline at end of file
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