Skip to content

J
jz_Travel
Commit 0c94d53d authored by 黄奎's avatar 黄奎
Browse files
Options

111

parent 19e7536e
Show whitespace changes
Inline Side-by-side
Showing with 1576 additions and 1633 deletions
components/auth/index.vue
View file @ 0c94d53d
...@@ -101,7 +101,6 @@ ...@@ -101,7 +101,6 @@
that.showDialog = true; that.showDialog = true;
wx.login({ wx.login({
success: (res) => { success: (res) => {
//console.log(res)
let obj = { let obj = {
Source: 1, Source: 1,
OpenId: "", OpenId: "",
......
pages/address/AddAddress.vue
View file @ 0c94d53d
...@@ -11,34 +11,30 @@ ...@@ -11,34 +11,30 @@
<Text>收货人</Text> <Text>收货人</Text>
<input class="uni-input inputM" v-model="msg.Name" /> <input class="uni-input inputM" v-model="msg.Name" />
</view> </view>
<view style="width: 100%;height: 1px;background: #f5f5f5;"/> <view style="width: 100%;height: 1px;background: #f5f5f5;" />
<view class="addcenter_item2"> <view class="addcenter_item2">
<Text>联系电话</Text> <Text>联系电话</Text>
<input class="uni-input inputM" v-model="msg.Mobile" /> <input class="uni-input inputM" v-model="msg.Mobile" />
</view> </view>
<view style="width: 100%;height: 1px;background: #f5f5f5;"/> <view style="width: 100%;height: 1px;background: #f5f5f5;" />
<!-- TODO 动态获取地址数据 --> <!-- TODO 动态获取地址数据 -->
<view class="addcenter_item"> <view class="addcenter_item">
<Text>所在地区</Text> <Text>所在地区</Text>
<view style="display: flex;flex-direction: row;align-items: center;" @click="addressShow = true"> <view style="display: flex;flex-direction: row;align-items: center;" @click="addressShow = true">
<Text :style="{'color':address!=''? '#303133':'#9D9C9B'}">{{address!=''? address :'请选择'}}</Text> <Text :style="{'color':address!=''? '#303133':'#9D9C9B'}">{{address!=''? address :'请选择'}}</Text>
<u-icon name="arrow" color="#B2B2B2" size="30" ></u-icon> <u-icon name="arrow" color="#B2B2B2" size="30"></u-icon>
<pickerAddress v-model="addressShow" @confirm="addresspick" /> <pickerAddress v-model="addressShow" @confirm="addresspick" />
</view> </view>
</view> </view>
<view style="width: 100%;height: 1px;background: #f5f5f5;"/> <view style="width: 100%;height: 1px;background: #f5f5f5;" />
<view class="addcenter_item2" style="align-items: flex-start;"> <view class="addcenter_item2" style="align-items: flex-start;">
<Text>详细地址</Text> <Text>详细地址</Text>
<textarea <textarea style="height: 50px;" class="inputM" v-model="msg.Address" />
style="height: 50px;"
class="inputM"
v-model="msg.Address"
/>
</view> </view>
</view> </view>
<!-- 智能识别 --> <!-- 智能识别 -->
<view class="smart"> <!-- <view class="smart">
<view> <view>
<span>智能识别</span> <span>智能识别</span>
<textarea <textarea
...@@ -55,7 +51,7 @@ ...@@ -55,7 +51,7 @@
</view> </view>
</view> </view>
</view> </view> -->
<view class="btn" @click="preserve" :style="{'background':mainColor}"> <view class="btn" @click="preserve" :style="{'background':mainColor}">
<Text>保存地址</Text> <Text>保存地址</Text>
</view> </view>
......
pages/airTicket/AirplanePassengerAddEditing.vue
View file @ 0c94d53d
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</view> </view>
<view class="height-line1"></view> <view class="height-line1"></view>
</view> </view>
<view class="column"> <view class="column" style="display: none;">
<view class="AirplanePassengerAddEditingC-text row-sb-n fz30"> <view class="AirplanePassengerAddEditingC-text row-sb-n fz30">
<text class="flexS AirplanePassengerAddEditingC-textL">联系电话</text> <text class="flexS AirplanePassengerAddEditingC-textL">联系电话</text>
<view class="flexG"> <view class="flexG">
...@@ -152,6 +152,9 @@ ...@@ -152,6 +152,9 @@
<text class="fz26 flexS">出生日期</text> <text class="fz26 flexS">出生日期</text>
<text class="fz30 fontBold flexG">{{addMsg.result.birthday}}</text> <text class="fz30 fontBold flexG">{{addMsg.result.birthday}}</text>
</view> --> </view> -->
</view>
<view>
</view> </view>
<view class="showAddEditing-buttom fz32 fontBold textCenter row-sb-n"> <view class="showAddEditing-buttom fz32 fontBold textCenter row-sb-n">
<view class="border1 colorDEBF7B borderDEBF7B" @click="showAddEditingPreviwe=false">返回修改</view> <view class="border1 colorDEBF7B borderDEBF7B" @click="showAddEditingPreviwe=false">返回修改</view>
......
pages/index/index.vue
View file @ 0c94d53d
<template> <template>
<view class="indexpage"> <view class="indexpage">
<view v-if="showStart == true" style="width: 100vw; height: 100vh"> <view v-if="showStart == true" style="width: 100vw; height: 100vh">
<image <image :src="startData.PicUrl" mode="aspectFit" style="width: 100%; height: 100%; position: relative">
:src="startData.PicUrl" <view class="Startbtn" :style="{ top: pagePaddingBottom }" @click="startb">
mode="aspectFit"
style="width: 100%; height: 100%; position: relative"
>
<view
class="Startbtn"
:style="{ top: pagePaddingBottom }"
@click="startb"
>
跳过 跳过
</view> </view>
</image> </image>
</view> </view>
<view <view v-if="myPageData.home_pages" v-show="showStart == false" :style="[myPageData.home_pages.navs[active].templateBg]">
v-if="myPageData.home_pages" <view class="content" :style="{
v-show="showStart == false"
:style="[myPageData.home_pages.navs[active].templateBg]"
>
<view
class="content"
:style="{
'padding-bottom':(pageId==0?'78px':'0px'), 'padding-bottom':(pageId==0?'78px':'0px'),
}" }">
>
<!-- paddingTop: pagePaddingBottom, --> <!-- paddingTop: pagePaddingBottom, -->
<view <view v-if="pageId!=0" class="index-title" :class="{ MainTopLeft: pageTitleStr.length > 10 }" :style="[
v-if="pageId!=0"
class="index-title"
:class="{ MainTopLeft: pageTitleStr.length > 10 }"
:style="[
myPageData.home_pages.navs[active].templateBg, myPageData.home_pages.navs[active].templateBg,
titleStyle, titleStyle,
{ {
...@@ -39,8 +20,7 @@ ...@@ -39,8 +20,7 @@
? myPageData.home_pages.navs[active].templateBg.titleColor ? myPageData.home_pages.navs[active].templateBg.titleColor
: '', : '',
}, },
]" ]">
>
<text v-if="isNavPosition == 0">{{ pageTitleStr }}</text> <text v-if="isNavPosition == 0">{{ pageTitleStr }}</text>
<view v-if="isNavPosition == 1" style="width: 78%"> <view v-if="isNavPosition == 1" style="width: 78%">
<search :style-str="searchData"></search> <search :style-str="searchData"></search>
...@@ -50,153 +30,58 @@ ...@@ -50,153 +30,58 @@
</view> </view>
</view> </view>
<!-- <view @click='yj' style="width: 200px;height: 50px;">活动</view> --> <!-- <view @click='yj' style="width: 200px;height: 50px;">活动</view> -->
<u-tabs <u-tabs v-if="myPageData.home_pages && myPageData.home_pages.navs.length > 1" name="name" :list="myPageData.home_pages.navs"
v-if="myPageData.home_pages && myPageData.home_pages.navs.length > 1" :is-scroll="true" :active-color="mainColor" :current="active" :bar-width="80" :font-size="32" :bold="false"
name="name" @change="changeHandler"></u-tabs>
:list="myPageData.home_pages.navs"
:is-scroll="true"
:active-color="mainColor"
:current="active"
:bar-width="80"
:font-size="32"
:bold="false"
@change="changeHandler"
></u-tabs>
<template v-for="(item, i) in myPageData.home_pages.navs"> <template v-for="(item, i) in myPageData.home_pages.navs">
<view :key="i" v-if="active == i"> <view :key="i" v-if="active == i">
<template v-for="(d, di) in item.template.data"> <template v-for="(d, di) in item.template.data">
<search <search v-if="d.id == 'search' && isNavPosition == 0" :style-str="d.data" :key="di"></search>
v-if="d.id == 'search' && isNavPosition == 0" <swiper v-if="d.id == 'banner'" :swipers="d.data" :key="di"></swiper>
:style-str="d.data"
:key="di"
></search>
<swiper
v-if="d.id == 'banner'"
:swipers="d.data"
:key="di"
></swiper>
<empty v-if="d.id == 'empty'" :block="d.data" :key="di"></empty> <empty v-if="d.id == 'empty'" :block="d.data" :key="di"></empty>
<rubik v-if="d.id == 'rubik'" :ad="d.data" :key="di"></rubik> <rubik v-if="d.id == 'rubik'" :ad="d.data" :key="di"></rubik>
<goods v-if="d.id == 'goods'" :goods="d.data" :key="di"></goods> <goods v-if="d.id == 'goods'" :goods="d.data" :key="di"></goods>
<notice <notice v-if="d.id == 'notice'" :notice="d.data" :key="di"></notice>
v-if="d.id == 'notice'"
:notice="d.data"
:key="di"
></notice>
<gridnav v-if="d.id == 'nav'" :navs="d.data" :key="di"></gridnav> <gridnav v-if="d.id == 'nav'" :navs="d.data" :key="di"></gridnav>
<pagetitle <pagetitle v-if="d.id == 'link'" :ts="d.data" :key="di"></pagetitle>
v-if="d.id == 'link'" <videopage v-if="d.id == 'video'" :video="d.data" :key="di"></videopage>
:ts="d.data" <copyright v-if="d.id == 'copyright'" :cop="d.data" :key="di"></copyright>
:key="di" <checkin v-if="d.id == 'check-in'" :check="d.data" :key="di"></checkin>
></pagetitle> <userbox v-if="d.id == 'user-info'" :ts="d.data" :key="di"></userbox>
<videopage
v-if="d.id == 'video'"
:video="d.data"
:key="di"
></videopage>
<copyright
v-if="d.id == 'copyright'"
:cop="d.data"
:key="di"
></copyright>
<checkin
v-if="d.id == 'check-in'"
:check="d.data"
:key="di"
></checkin>
<userbox
v-if="d.id == 'user-info'"
:ts="d.data"
:key="di"
></userbox>
<view v-if="d.id == 'image-text'" class="imageText" :key="di"> <view v-if="d.id == 'image-text'" class="imageText" :key="di">
<view v-html="d.data.content"></view> <view v-html="d.data.content"></view>
</view> </view>
<userorder <userorder v-if="d.id == 'user-order'" :uo="d.data" :key="di"></userorder>
v-if="d.id == 'user-order'"
:uo="d.data"
:key="di"
></userorder>
<mapi v-if="d.id == 'map'" :mapi="d.data" :key="di"></mapi> <mapi v-if="d.id == 'map'" :mapi="d.data" :key="di"></mapi>
<checkform <checkform v-if="d.id == 'form'" :forms="d.data" :key="di"></checkform>
v-if="d.id == 'form'" <addialog v-if="d.id == 'modal' && d.data.opened" :ads="d.data" :key="di"></addialog>
:forms="d.data" <quicknav v-if="d.id == 'quick-nav' && d.data.navSwitch == 1" :navs="d.data" :key="di"></quicknav>
:key="di"
></checkform>
<addialog
v-if="d.id == 'modal' && d.data.opened"
:ads="d.data"
:key="di"
></addialog>
<quicknav
v-if="d.id == 'quick-nav' && d.data.navSwitch == 1"
:navs="d.data"
:key="di"
></quicknav>
<!-- <pingtuan <!-- <pingtuan
v-if="d.id == 'pintuan'" v-if="d.id == 'pintuan'"
:goods="d.data" :goods="d.data"
:key="di" :key="di"
></pingtuan> --> ></pingtuan> -->
<shopinfo <shopinfo v-if="d.id == 'shop-info'" :ad="d.data" :key="di" ref="son"></shopinfo>
v-if="d.id == 'shop-info'" <guide v-if="d.id == 'drive-guide'" :info="d.data" ref="city"></guide>
:ad="d.data"
:key="di"
ref="son"
></shopinfo>
<guide
v-if="d.id == 'drive-guide'"
:info="d.data"
ref="city"
></guide>
<!-- 网课列表 --> <!-- 网课列表 -->
<rgoods v-if="d.id == 'educationCustom'" :goods="d.data"></rgoods> <rgoods v-if="d.id == 'educationCustom'" :goods="d.data"></rgoods>
<!-- 资讯 --> <!-- 资讯 -->
<argoods <argoods v-if="d.id == 'educationArticle'" :goods="d.data"></argoods>
v-if="d.id == 'educationArticle'"
:goods="d.data"
></argoods>
<!-- 最近学习组件 --> <!-- 最近学习组件 -->
<rstudy <rstudy v-if="d.id == 'education'" :goods="d.data" ref="study"></rstudy>
v-if="d.id == 'education'" <store v-if="d.id == 'reservestore'" :goods="d.data" :storeinfo="storeInfo"></store>
:goods="d.data"
ref="study"
></rstudy>
<store
v-if="d.id == 'reservestore'"
:goods="d.data"
:storeinfo="storeInfo"
></store>
<!-- 线下服务商品 --> <!-- 线下服务商品 -->
<sindex <sindex v-if="d.id == 'storeGoods'" :goods="d.data" :key="di"></sindex>
v-if="d.id == 'storeGoods'"
:goods="d.data"
:key="di"
></sindex>
<!-- 老师列表 --> <!-- 老师列表 -->
<educationteacher <educationteacher v-if="d.id == 'educationteacher'" :goods="d.data" :key="di"></educationteacher>
v-if="d.id == 'educationteacher'"
:goods="d.data"
:key="di"
></educationteacher>
<!--导航栏--> <!--导航栏-->
<navpage <navpage v-if="d.id == 'nav-page'" :navs="d.data" :key="di"></navpage>
v-if="d.id == 'nav-page'"
:navs="d.data"
:key="di"
></navpage>
<!-- 相亲的人物模板 --> <!-- 相亲的人物模板 -->
<!-- <matchmaking v-if="d.id == 'miaiuser'" :navs="d.data" :key="di"></matchmaking> --> <!-- <matchmaking v-if="d.id == 'miaiuser'" :navs="d.data" :key="di"></matchmaking> -->
<!-- 相亲活动 --> <!-- 相亲活动 -->
<miaiactivitytype <miaiactivitytype v-if="d.id == 'miaiactivitytype'" :goods="d.data"></miaiactivitytype>
v-if="d.id == 'miaiactivitytype'"
:goods="d.data"
></miaiactivitytype>
<!-- 相亲活动自定义 --> <!-- 相亲活动自定义 -->
<miaiactivityCustom <miaiactivityCustom v-if="d.id == 'miaiactivityCustom'" :goods="d.data"></miaiactivityCustom>
v-if="d.id == 'miaiactivityCustom'"
:goods="d.data"
></miaiactivityCustom>
</template> </template>
</view> </view>
</template> </template>
...@@ -204,9 +89,7 @@ ...@@ -204,9 +89,7 @@
<tabbar></tabbar> <tabbar></tabbar>
</view> </view>
<view <view class="tips_t" v-if="
class="tips_t"
v-if="
add_show == 1 && add_show == 1 &&
JSON.stringify(setting) != '{}' && JSON.stringify(setting) != '{}' &&
setting.add_app_text != null setting.add_app_text != null
...@@ -215,76 +98,56 @@ ...@@ -215,76 +98,56 @@
'border-radius': setting.add_app_bg_radius + 'rpx', 'border-radius': setting.add_app_bg_radius + 'rpx',
opacity: setting.add_app_bg_transparency / 100, opacity: setting.add_app_bg_transparency / 100,
top: pagePaddingBottom, top: pagePaddingBottom,
}" }">
>
<u-icon name="cross" color="#fff" @click="close"></u-icon> <u-icon name="cross" color="#fff" @click="close"></u-icon>
<view <view style="width: 1px; height: 20px; margin: 0 10px; background: #fff"></view>
style="width: 1px; height: 20px; margin: 0 10px; background: #fff"
></view>
<Text style="color: #fff">{{ setting.add_app_text }}</Text> <Text style="color: #fff">{{ setting.add_app_text }}</Text>
<view class="triangle-up" :style="{ top: pagePaddingBottom }"></view> <view class="triangle-up" :style="{ top: pagePaddingBottom }"></view>
</view> </view>
<coupon <coupon v-if="showCoupons" :coupon-message="couponMessage" :cform="ComeFrom" @goLook="goLook" @closeBtn="closeBtn"></coupon>
v-if="showCoupons" <auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
:coupon-message="couponMessage"
:cform="ComeFrom"
@goLook="goLook"
@closeBtn="closeBtn"
></coupon>
<auth
v-if="showAuth"
@changeuserinfo="reloadUserinfo"
@gbAuth="gbAuth"
></auth>
<!-- <official-account></official-account> --> <!-- <official-account></official-account> -->
<orderPopup <orderPopup v-if="showorder" :orderPopupdata="orderPopupdata" @gosalesvolume="gosalesvolume" @closeBtn="closeBtn_order"></orderPopup>
v-if="showorder"
:orderPopupdata="orderPopupdata"
@gosalesvolume="gosalesvolume"
@closeBtn="closeBtn_order"
></orderPopup>
</view> </view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import tabbar from "@/components/tabbar/index"; import tabbar from "@/components/tabbar/index";
import search from "@/components/search/index"; import search from "@/components/search/index";
import swiper from "@/components/swiper/index"; import swiper from "@/components/swiper/index";
import empty from "@/components/empty/index"; import empty from "@/components/empty/index";
import rubik from "@/components/rubik/index"; import rubik from "@/components/rubik/index";
import goods from "@/components/goods/index"; import goods from "@/components/goods/index";
import notice from "@/components/notice/index"; import notice from "@/components/notice/index";
import gridnav from "@/components/gridnav/index"; import gridnav from "@/components/gridnav/index";
import pagetitle from "@/components/pagetitle/index"; import pagetitle from "@/components/pagetitle/index";
import videopage from "@/components/videopage/index"; import videopage from "@/components/videopage/index";
import copyright from "@/components/copyright/index"; import copyright from "@/components/copyright/index";
import checkin from "@/components/checkin/index"; import checkin from "@/components/checkin/index";
import userbox from "@/components/userbox/index"; import userbox from "@/components/userbox/index";
import userorder from "@/components/userorder/index"; import userorder from "@/components/userorder/index";
import mapi from "@/components/mapi/index"; import mapi from "@/components/mapi/index";
import checkform from "@/components/checkform/index"; import checkform from "@/components/checkform/index";
import addialog from "@/components/addialog/index"; import addialog from "@/components/addialog/index";
import quicknav from "@/components/quicknav/index"; import quicknav from "@/components/quicknav/index";
import coupon from "@/components/coupons/coupons"; import coupon from "@/components/coupons/coupons";
// import pingtuan from "@/components/pingtuan/index"; import shopinfo from "@/components/shopinfo/shopinfo";
import shopinfo from "@/components/shopinfo/shopinfo"; import auth from "@/components/auth/index.vue";
import auth from "@/components/auth/index.vue"; import guide from "@/components/guidecar/index.vue";
import guide from "@/components/guidecar/index.vue"; import rstudy from "@/components/study/Rstudy.vue";
import rstudy from "@/components/study/Rstudy.vue"; import rgoods from "@/components/study/index.vue";
import rgoods from "@/components/study/index.vue"; import argoods from "@/components/studyArticle/index.vue";
import argoods from "@/components/studyArticle/index.vue"; import store from "@/components/store/store.vue";
import store from "@/components/store/store.vue"; import sindex from "@/components/store/index.vue";
import sindex from "@/components/store/index.vue"; import educationteacher from "@/components/educationteacher/index";
import educationteacher from "@/components/educationteacher/index"; import navpage from "@/components/navpage/index";
import navpage from "@/components/navpage/index"; import miaiactivitytype from "@/components/miaiactivitytype/index";
// import matchmaking from "@/components/matchmaking/index" import miaiactivityCustom from "@/components/miaiactivityCustom/index";
import miaiactivitytype from "@/components/miaiactivitytype/index"; import orderPopup from "@/components/coupons/orderPopup.vue"; //离线订单弹窗
import miaiactivityCustom from "@/components/miaiactivityCustom/index"; const innerAudioContext = uni.createInnerAudioContext();
import orderPopup from "@/components/coupons/orderPopup.vue"; //离线订单弹窗 export default {
const innerAudioContext = uni.createInnerAudioContext();
export default {
data() { data() {
return { return {
title: "Hello", title: "Hello",
...@@ -351,7 +214,6 @@ export default { ...@@ -351,7 +214,6 @@ export default {
addialog, addialog,
quicknav, quicknav,
coupon, coupon,
// pingtuan,
shopinfo, shopinfo,
auth, auth,
guide, guide,
...@@ -362,7 +224,6 @@ export default { ...@@ -362,7 +224,6 @@ export default {
sindex, sindex,
educationteacher, educationteacher,
navpage, navpage,
// matchmaking,
miaiactivitytype, miaiactivitytype,
miaiactivityCustom, miaiactivityCustom,
orderPopup, orderPopup,
...@@ -380,6 +241,14 @@ export default { ...@@ -380,6 +241,14 @@ export default {
}); });
let c = this.$uiConfig.is_bang ? 78 : 50; let c = this.$uiConfig.is_bang ? 78 : 50;
this.contentHeight = this.$utils.calcContentHeight(c); this.contentHeight = this.$utils.calcContentHeight(c);
if(options&&options.lxyType&&options.lxyType==1)
{
//跳转到视频详情
uni.navigateTo({
url: "/pages/video/video?vId=" + options.vId,
});
}
if (options && options.page_id) { if (options && options.page_id) {
this.pageId = options.page_id; this.pageId = options.page_id;
let queryString = ""; let queryString = "";
...@@ -413,7 +282,6 @@ export default { ...@@ -413,7 +282,6 @@ export default {
} }
if (options && options.custom_params) { if (options && options.custom_params) {
let custom_params = JSON.parse(decodeURIComponent(options.custom_params)); let custom_params = JSON.parse(decodeURIComponent(options.custom_params));
console.log(custom_params);
if (custom_params.user_id) { if (custom_params.user_id) {
uni.setStorageSync("pid", { uni.setStorageSync("pid", {
pid: custom_params.user_id, pid: custom_params.user_id,
...@@ -482,28 +350,27 @@ export default { ...@@ -482,28 +350,27 @@ export default {
this.JumpType = options.JumpType; this.JumpType = options.JumpType;
if (options.JumpType == 3) { if (options.JumpType == 3) {
this.guidecar.GoodsId = options.GoodsId; this.guidecar.GoodsId = options.GoodsId;
this.guidecar.address = options.address this.guidecar.address = options.address ?
? JSON.parse(decodeURIComponent(options.address)) JSON.parse(decodeURIComponent(options.address)) :
: ""; "";
this.guidecar.Pickcar = options.Pickcar this.guidecar.Pickcar = options.Pickcar ?
? JSON.parse(decodeURIComponent(options.Pickcar)) JSON.parse(decodeURIComponent(options.Pickcar)) :
: ""; "";
this.guidecar.StartTime = options.StartTime ? options.StartTime : ""; this.guidecar.StartTime = options.StartTime ? options.StartTime : "";
this.guidecar.EndTime = options.EndTime ? options.EndTime : ""; this.guidecar.EndTime = options.EndTime ? options.EndTime : "";
} }
} }
if (options && options.J) { if (options && options.J) {
//司导分享的的特殊处理 //司导分享的的特殊处理
this.JumpType = options.J; this.JumpType = options.J;
if (options.J == 3) { if (options.J == 3) {
this.guidecar.GoodsId = options.i; this.guidecar.GoodsId = options.i;
this.guidecar.address = options.address this.guidecar.address = options.address ?
? JSON.parse(decodeURIComponent(options.address)) JSON.parse(decodeURIComponent(options.address)) :
: ""; "";
this.guidecar.Pickcar = options.P this.guidecar.Pickcar = options.P ?
? JSON.parse(decodeURIComponent(options.P)) JSON.parse(decodeURIComponent(options.P)) :
: ""; "";
this.guidecar.StartTime = options.S ? options.S : ""; this.guidecar.StartTime = options.S ? options.S : "";
this.guidecar.EndTime = options.E ? options.E : ""; this.guidecar.EndTime = options.E ? options.E : "";
} }
...@@ -559,59 +426,26 @@ export default { ...@@ -559,59 +426,26 @@ export default {
} else { } else {
that.sharejump(); //4-9新加 that.sharejump(); //4-9新加
} }
//4-11这里暂时不能使用
// wx.getUserInfo({//4-9修改 不使用getUserInfo 会造成获取回来的微信默认名称和头像
// success: function(res) {//4-9之后的好像这里不能静默登录了需要弹出登录
// console.log(res,'getUserInfo')
// if (uni.getStorageSync("mall_UserInfo")) {
// let uid = uni.getStorageSync("mall_UserInfo").UserId;
// let msg = {
// Id: uid,
// AliasName: res.userInfo.nickName,
// Photo: res.userInfo.avatarUrl,
// };
// that.updateuserinfo(msg);
// that.getPageType()
// // 如果登录的情况下直接跳转商品详情或者直播列表
// // that.sharejump();
// //如果登录状态 并且是uni.getStorageSync("CounponPassword")
// if(uni.getStorageSync("CounponPassword")){
// that.getunilogin(res)
// }
// } else {
// that.getunilogin(res)
// }
// },
// fail: function(e) {
// uni.showToast({
// title: "微信登录授权失败",
// icon: "none"
// });
// },
// });
// #endif // #endif
let set = uni.getStorageSync("basedata") let set = uni.getStorageSync("basedata") ?
? uni.getStorageSync("basedata").mall.setting uni.getStorageSync("basedata").mall.setting : {};
: {};
if (!uni.getStorageSync("add_top_app")) { if (!uni.getStorageSync("add_top_app")) {
uni.setStorageSync("add_top_app", { uni.setStorageSync("add_top_app", {
add_top_app_show: 1, add_top_app_show: 1,
}); });
} }
this.add_show = uni.getStorageSync("add_top_app") this.add_show = uni.getStorageSync("add_top_app") ?
? uni.getStorageSync("add_top_app").add_top_app_show uni.getStorageSync("add_top_app").add_top_app_show :
: 1; 1;
this.setting = set; this.setting = set;
this.isShowBack(); this.isShowBack();
// this.init();
let now = new Date(); let now = new Date();
let nowtime = let nowtime =
now.getFullYear() + "-" + (now.getMonth() + 1) + "-" + now.getDate(); now.getFullYear() + "-" + (now.getMonth() + 1) + "-" + now.getDate();
// this.getIsOpenReserve();//4-11注释
if (!uni.getStorageSync("Startup_page")) { if (!uni.getStorageSync("Startup_page")) {
//获取启动页信息1、没有记录日期 //获取启动页信息1、没有记录日期
this.getstartModel(nowtime); this.getstartModel(nowtime);
...@@ -634,30 +468,28 @@ export default { ...@@ -634,30 +468,28 @@ export default {
// console.log("分享调用"); // console.log("分享调用");
this.getReceive(); this.getReceive();
}, 2500); }, 2500);
let uid = uni.getStorageSync("mall_UserInfo") let uid = uni.getStorageSync("mall_UserInfo") ?
? uni.getStorageSync("mall_UserInfo").UserId uni.getStorageSync("mall_UserInfo").UserId :
: 0; 0;
if (uid == 0) { if (uid == 0) {
uid = uni.getStorageSync("pid") ? uni.getStorageSync("pid").pid : 0; uid = uni.getStorageSync("pid") ? uni.getStorageSync("pid").pid : 0;
} }
let SmallShopId = uni.getStorageSync("mall_UserInfo") let SmallShopId = uni.getStorageSync("mall_UserInfo") ?
? uni.getStorageSync("mall_UserInfo").SmallShopId uni.getStorageSync("mall_UserInfo").SmallShopId :
: 0; 0;
if (SmallShopId == 0) { if (SmallShopId == 0) {
//如果微店id为0 去找所属微店id //如果微店id为0 去找所属微店id
SmallShopId = uni.getStorageSync("mall_UserInfo") SmallShopId = uni.getStorageSync("mall_UserInfo") ?
? uni.getStorageSync("mall_UserInfo").UserSmallShopId uni.getStorageSync("mall_UserInfo").UserSmallShopId :
: 0; 0;
} }
let title = this.setting.share_title let title = this.setting.share_title ?
? this.setting.share_title this.setting.share_title :
: uni.getStorageSync("basedata").mall.name; uni.getStorageSync("basedata").mall.name;
// if (SmallShopId != 0) {
// title = this.shopData.Name let Up = uni.getStorageSync("mall_UserInfo") ?
// } uni.getStorageSync("mall_UserInfo").UserPageType :
let Up = uni.getStorageSync("mall_UserInfo") 0;
? uni.getStorageSync("mall_UserInfo").UserPageType
: 0;
return { return {
title: title, title: title,
query: "user_id=" + uid + "&SmallShopId=" + SmallShopId + "&Up=" + Up, query: "user_id=" + uid + "&SmallShopId=" + SmallShopId + "&Up=" + Up,
...@@ -669,34 +501,31 @@ export default { ...@@ -669,34 +501,31 @@ export default {
// console.log("分享调用"); // console.log("分享调用");
this.getReceive(); this.getReceive();
}, 2500); }, 2500);
let uid = uni.getStorageSync("mall_UserInfo") let uid = uni.getStorageSync("mall_UserInfo") ?
? uni.getStorageSync("mall_UserInfo").UserId uni.getStorageSync("mall_UserInfo").UserId :
: 0; 0;
if (uid == 0) { if (uid == 0) {
uid = uni.getStorageSync("pid") ? uni.getStorageSync("pid").pid : 0; uid = uni.getStorageSync("pid") ? uni.getStorageSync("pid").pid : 0;
} }
let SmallShopId = uni.getStorageSync("mall_UserInfo") let SmallShopId = uni.getStorageSync("mall_UserInfo") ?
? uni.getStorageSync("mall_UserInfo").SmallShopId uni.getStorageSync("mall_UserInfo").SmallShopId :
: 0; 0;
if (SmallShopId == 0) { if (SmallShopId == 0) {
//如果微店id为0 去找所属微店id //如果微店id为0 去找所属微店id
SmallShopId = uni.getStorageSync("mall_UserInfo") SmallShopId = uni.getStorageSync("mall_UserInfo") ?
? uni.getStorageSync("mall_UserInfo").UserSmallShopId uni.getStorageSync("mall_UserInfo").UserSmallShopId :
: 0; 0;
} }
let title = this.setting.share_title let title = this.setting.share_title ?
? this.setting.share_title this.setting.share_title :
: uni.getStorageSync("basedata").mall.name; uni.getStorageSync("basedata").mall.name;
// if (SmallShopId != 0) {
// title = this.shopData.Name let Up = uni.getStorageSync("mall_UserInfo") ?
// } uni.getStorageSync("mall_UserInfo").UserPageType :
let Up = uni.getStorageSync("mall_UserInfo") 0;
? uni.getStorageSync("mall_UserInfo").UserPageType
: 0;
return { return {
title: title, title: title,
path: path: "/pages/index/index?user_id=" +
"/pages/index/index?user_id=" +
uid + uid +
"&SmallShopId=" + "&SmallShopId=" +
SmallShopId + SmallShopId +
...@@ -715,11 +544,6 @@ export default { ...@@ -715,11 +544,6 @@ export default {
}, },
methods: { methods: {
// goOrderDetails(){
// uni.navigateTo({
// url:"/pages/jiuzhai/jz_SureOrder?orderId=42389"
// })
// },
getunilogin(res) { getunilogin(res) {
let that = this; let that = this;
//静默登录操作 //静默登录操作
...@@ -750,8 +574,7 @@ export default { ...@@ -750,8 +574,7 @@ export default {
}, },
//获取IsOpenReserve //获取IsOpenReserve
getIsOpenReserve() { getIsOpenReserve() {
this.request2( this.request2({
{
url: "/api/Mall/GetAppConfig", url: "/api/Mall/GetAppConfig",
data: {}, data: {},
}, },
...@@ -779,13 +602,14 @@ export default { ...@@ -779,13 +602,14 @@ export default {
return iDays; return iDays;
}, },
getstartModel(time) { getstartModel(time) {
this.request2( this.request2({
{
url: "/api/AppletSchool/GetEducationStartUpModel", url: "/api/AppletSchool/GetEducationStartUpModel",
data: {}, data: {},
}, },
(res) => { (res) => {
uni.setStorageSync("Startup_page", { time: time }); //方便在分类判断 uni.setStorageSync("Startup_page", {
time: time
}); //方便在分类判断
if (res.resultCode == 1) { if (res.resultCode == 1) {
if (res.data.IsShow == 1) { if (res.data.IsShow == 1) {
this.showStart = true; this.showStart = true;
...@@ -800,8 +624,7 @@ export default { ...@@ -800,8 +624,7 @@ export default {
} }
}, res.data.Seconds * 1000); }, res.data.Seconds * 1000);
} }
} else { } else {}
}
} }
); );
}, },
...@@ -817,7 +640,6 @@ export default { ...@@ -817,7 +640,6 @@ export default {
console.log(e); console.log(e);
uni.checkSession({ uni.checkSession({
//检查登录状态是否过期 //检查登录状态是否过期
success: (x) => { success: (x) => {
if (x.errMsg == "checkSession:ok") { if (x.errMsg == "checkSession:ok") {
//没有过期 //没有过期
...@@ -834,8 +656,7 @@ export default { ...@@ -834,8 +656,7 @@ export default {
getCode(obj) { getCode(obj) {
var that = this; var that = this;
//这里请求接口 //这里请求接口
that.request2( that.request2({
{
url: "/api/mall/GetWeChatOpenId", url: "/api/mall/GetWeChatOpenId",
data: { data: {
Code: obj.code, Code: obj.code,
...@@ -853,18 +674,17 @@ export default { ...@@ -853,18 +674,17 @@ export default {
var that = this; var that = this;
let pid = uni.getStorageSync("pid") ? uni.getStorageSync("pid").pid : 0; let pid = uni.getStorageSync("pid") ? uni.getStorageSync("pid").pid : 0;
let Up = uni.getStorageSync("Up") ? uni.getStorageSync("Up").Up : 0; let Up = uni.getStorageSync("Up") ? uni.getStorageSync("Up").Up : 0;
let SmallShopId = uni.getStorageSync("SmallShopId") let SmallShopId = uni.getStorageSync("SmallShopId") ?
? uni.getStorageSync("SmallShopId").SmallShopId uni.getStorageSync("SmallShopId").SmallShopId :
: 0; 0;
let CounponPassword = uni.getStorageSync("CounponPassword") let CounponPassword = uni.getStorageSync("CounponPassword") ?
? uni.getStorageSync("CounponPassword").CounponPassword uni.getStorageSync("CounponPassword").CounponPassword :
: 0; 0;
let KeyWord = uni.getStorageSync("KeyWord") let KeyWord = uni.getStorageSync("KeyWord") ?
? uni.getStorageSync("KeyWord").KeyWord uni.getStorageSync("KeyWord").KeyWord :
: ""; "";
that.request2( that.request2({
{
url: "/api/AppletLogin/Login", url: "/api/AppletLogin/Login",
data: { data: {
Source: 1, Source: 1,
...@@ -914,9 +734,9 @@ export default { ...@@ -914,9 +734,9 @@ export default {
getorderPupop() { getorderPupop() {
let now = new Date(); let now = new Date();
let Month = let Month =
now.getMonth() + 1 < 10 now.getMonth() + 1 < 10 ?
? "0" + (now.getMonth() + 1) "0" + (now.getMonth() + 1) :
: now.getMonth() + 1; now.getMonth() + 1;
let day = now.getDate() < 10 ? "0" + now.getDate() : now.getDate(); let day = now.getDate() < 10 ? "0" + now.getDate() : now.getDate();
let nowtime = let nowtime =
now.getFullYear() + now.getFullYear() +
...@@ -936,11 +756,12 @@ export default { ...@@ -936,11 +756,12 @@ export default {
this.getUserOffline(nowtime, oldtime); this.getUserOffline(nowtime, oldtime);
} }
} }
uni.setStorageSync("order_old_time", { time: nowtime }); //吧当前时间存起来 uni.setStorageSync("order_old_time", {
time: nowtime
}); //吧当前时间存起来
}, },
getUserOffline(now, old) { getUserOffline(now, old) {
this.request2( this.request2({
{
url: "/api/AppletUser/GetUserOfflineEarningsInfo", url: "/api/AppletUser/GetUserOfflineEarningsInfo",
data: { data: {
StartTime: old, StartTime: old,
...@@ -963,11 +784,10 @@ export default { ...@@ -963,11 +784,10 @@ export default {
gosalesvolume() { gosalesvolume() {
this.showorder = false; this.showorder = false;
setTimeout(() => { setTimeout(() => {
let UserId = uni.getStorageSync("mall_UserInfo") let UserId = uni.getStorageSync("mall_UserInfo") ?
? uni.getStorageSync("mall_UserInfo").UserId uni.getStorageSync("mall_UserInfo").UserId :
: 0; 0;
uni.navigateTo({ uni.navigateTo({
// url: "/pages/share/salesvolume?UserId="+UserId,
url: "/pages/share-order/share-order", url: "/pages/share-order/share-order",
}); });
}, 10); }, 10);
...@@ -1013,8 +833,7 @@ export default { ...@@ -1013,8 +833,7 @@ export default {
} else if (that.JumpType == 8) { } else if (that.JumpType == 8) {
//服务人员详情 //服务人员详情
uni.navigateTo({ uni.navigateTo({
url: url: "/pages/reserve/designerDetail?ID=" +
"/pages/reserve/designerDetail?ID=" +
that.GoodsId + that.GoodsId +
"&storeId=" + "&storeId=" +
that.fxstoreId, that.fxstoreId,
...@@ -1022,7 +841,9 @@ export default { ...@@ -1022,7 +841,9 @@ export default {
} else if (that.JumpType == 9) { } else if (that.JumpType == 9) {
//线下服务商品 //线下服务商品
try { try {
uni.setStorageSync("storeId", { storeId: that.fxstoreId }); uni.setStorageSync("storeId", {
storeId: that.fxstoreId
});
} catch (e) { } catch (e) {
console.log(e); console.log(e);
} }
...@@ -1042,8 +863,7 @@ export default { ...@@ -1042,8 +863,7 @@ export default {
} else if (that.JumpType == 12) { } else if (that.JumpType == 12) {
//储值卡的领取 //储值卡的领取
uni.navigateTo({ uni.navigateTo({
url: url: "/pages/coupon/cards/cardsreceive?Id=" +
"/pages/coupon/cards/cardsreceive?Id=" +
that.GoodsId + that.GoodsId +
"&cardsmoney=" + "&cardsmoney=" +
that.cardsmoney, that.cardsmoney,
...@@ -1055,7 +875,9 @@ export default { ...@@ -1055,7 +875,9 @@ export default {
}); });
} else if (that.JumpType == 14) { } else if (that.JumpType == 14) {
//用户资料填写 //用户资料填写
uni.navigateTo({ url: "/pages/blindDate/editData" }); uni.navigateTo({
url: "/pages/blindDate/editData"
});
} else if (that.JumpType == 15) { } else if (that.JumpType == 15) {
//门票详情 //门票详情
uni.navigateTo({ uni.navigateTo({
...@@ -1074,8 +896,7 @@ export default { ...@@ -1074,8 +896,7 @@ export default {
} else if (that.JumpType == 18) { } else if (that.JumpType == 18) {
//酒店详情 //酒店详情
uni.navigateTo({ uni.navigateTo({
url: url: "/pages/hotel/detail?id=" +
"/pages/hotel/detail?id=" +
that.GoodsId + that.GoodsId +
"&dayObj=" + "&dayObj=" +
that.dayObj + that.dayObj +
...@@ -1085,8 +906,7 @@ export default { ...@@ -1085,8 +906,7 @@ export default {
} else if (that.JumpType == 19) { } else if (that.JumpType == 19) {
//线路详情 //线路详情
uni.navigateTo({ uni.navigateTo({
url: url: "/pages/jiuzhai/jz_LineDetail?tcid=" +
"/pages/jiuzhai/jz_LineDetail?tcid=" +
that.tcid + that.tcid +
"&configId=" + "&configId=" +
that.configId + that.configId +
...@@ -1097,8 +917,7 @@ export default { ...@@ -1097,8 +917,7 @@ export default {
}, 500); }, 500);
}, },
updateuserinfo(msg) { updateuserinfo(msg) {
this.request2( this.request2({
{
url: "/api/MemberUser/SetMemberPhoto", url: "/api/MemberUser/SetMemberPhoto",
data: msg, data: msg,
}, },
...@@ -1117,7 +936,6 @@ export default { ...@@ -1117,7 +936,6 @@ export default {
let navs = uni.getStorageSync("navs") ? uni.getStorageSync("navs") : []; let navs = uni.getStorageSync("navs") ? uni.getStorageSync("navs") : [];
if (navs) { if (navs) {
let t = getCurrentPages(); let t = getCurrentPages();
let query = t[t.length - 1].__displayReporter.query; let query = t[t.length - 1].__displayReporter.query;
let queryString = ""; let queryString = "";
for (var k in query) { for (var k in query) {
...@@ -1139,8 +957,7 @@ export default { ...@@ -1139,8 +957,7 @@ export default {
}, },
getjump(scene) { getjump(scene) {
let a = "YZnsGuRojCKBkb1siP3VwkhkPFvh-D"; //测试数据 let a = "YZnsGuRojCKBkb1siP3VwkhkPFvh-D"; //测试数据
this.request( this.request({
{
url: "", url: "",
data: { data: {
r: "api/default/qr-code-parameter", r: "api/default/qr-code-parameter",
...@@ -1166,9 +983,9 @@ export default { ...@@ -1166,9 +983,9 @@ export default {
return n.substr(1); return n.substr(1);
}, },
init() { init() {
let mall_IsOpenSchool = uni.getStorageSync("mall_UserInfo") let mall_IsOpenSchool = uni.getStorageSync("mall_UserInfo") ?
? uni.getStorageSync("mall_UserInfo").IsOpenSchool uni.getStorageSync("mall_UserInfo").IsOpenSchool :
: 0; 0;
let open_school = 0; let open_school = 0;
if (this.IsOpenSchool == 1 && mall_IsOpenSchool == 1) { if (this.IsOpenSchool == 1 && mall_IsOpenSchool == 1) {
...@@ -1178,11 +995,10 @@ export default { ...@@ -1178,11 +995,10 @@ export default {
open_school = 0; open_school = 0;
} }
let storeId = let storeId =
uni.getStorageSync("storeId") && uni.getStorageSync("storeId").storeId uni.getStorageSync("storeId") && uni.getStorageSync("storeId").storeId ?
? uni.getStorageSync("storeId").storeId uni.getStorageSync("storeId").storeId :
: 0; 0;
this.request2( this.request2({
{
url: "/api/Mall/GetHome", url: "/api/Mall/GetHome",
data: { data: {
page_id: this.pageId, page_id: this.pageId,
...@@ -1225,8 +1041,7 @@ export default { ...@@ -1225,8 +1041,7 @@ export default {
} else if (x.id == "miaiuser") { } else if (x.id == "miaiuser") {
//4-29新加 相亲模式随机的时候调用接口 //4-29新加 相亲模式随机的时候调用接口
if (x.data.addUserType == 4) { if (x.data.addUserType == 4) {
this.request2( this.request2({
{
url: "/api/AppletMiai/GetDailyRandomList", url: "/api/AppletMiai/GetDailyRandomList",
data: { data: {
pageIndex: 1, pageIndex: 1,
...@@ -1291,31 +1106,30 @@ export default { ...@@ -1291,31 +1106,30 @@ export default {
let that = this; let that = this;
uni.getLocation({ uni.getLocation({
type: "wgs84", type: "wgs84",
success: function (res) { success: function(res) {
let position = res.latitude + "," + res.longitude; let position = res.latitude + "," + res.longitude;
uni.setStorageSync("position", { uni.setStorageSync("position", {
position: position, position: position,
}); });
that.getCurrentStore(); that.getCurrentStore();
}, },
fail: function (err) { fail: function(err) {
that.getCurrentStore(); that.getCurrentStore();
}, },
}); });
}, },
getCurrentStore() { getCurrentStore() {
let storeId = let storeId =
uni.getStorageSync("storeId") && uni.getStorageSync("storeId").storeId uni.getStorageSync("storeId") && uni.getStorageSync("storeId").storeId ?
? uni.getStorageSync("storeId").storeId uni.getStorageSync("storeId").storeId :
: 0; 0;
let position = let position =
uni.getStorageSync("position") && uni.getStorageSync("position") &&
uni.getStorageSync("position").position uni.getStorageSync("position").position ?
? uni.getStorageSync("position").position uni.getStorageSync("position").position :
: ""; "";
this.request2( this.request2({
{
url: "/api/AppletStores/GetCurrentStore", url: "/api/AppletStores/GetCurrentStore",
data: { data: {
storeId: storeId, storeId: storeId,
...@@ -1338,16 +1152,15 @@ export default { ...@@ -1338,16 +1152,15 @@ export default {
); );
}, },
getSmallShopById() { getSmallShopById() {
let Id = uni.getStorageSync("mall_UserInfo") let Id = uni.getStorageSync("mall_UserInfo") ?
? uni.getStorageSync("mall_UserInfo").SmallShopId uni.getStorageSync("mall_UserInfo").SmallShopId :
: 0; 0;
if (Id == 0) { if (Id == 0) {
Id = uni.getStorageSync("mall_UserInfo") Id = uni.getStorageSync("mall_UserInfo") ?
? uni.getStorageSync("mall_UserInfo").UserSmallShopId uni.getStorageSync("mall_UserInfo").UserSmallShopId :
: 0; 0;
} }
this.request2( this.request2({
{
url: "/api/AppletUser/GetSmallShopById", url: "/api/AppletUser/GetSmallShopById",
data: { data: {
Id: Id, Id: Id,
...@@ -1382,10 +1195,11 @@ export default { ...@@ -1382,10 +1195,11 @@ export default {
y.templateBg.backgroundColor = x.data.backgroundColor; y.templateBg.backgroundColor = x.data.backgroundColor;
y.templateBg.backgroundImage = `url('${x.data.backgroundPicUrl}')`; y.templateBg.backgroundImage = `url('${x.data.backgroundPicUrl}')`;
y.templateBg.backgroundPosition = x.data.positionText; y.templateBg.backgroundPosition = x.data.positionText;
y.templateBg.backgroundRepeat = x.data.repeatText y.templateBg.backgroundRepeat = x.data.repeatText ?
? x.data.repeatText x.data.repeatText :
: "no-repeat"; "no-repeat";
y.templateBg.backgroundSize = `${ y.templateBg.backgroundSize =
`${
x.data.backgroundWidth == 0 x.data.backgroundWidth == 0
? "auto" ? "auto"
: x.data.backgroundWidth + "%" : x.data.backgroundWidth + "%"
...@@ -1408,7 +1222,6 @@ export default { ...@@ -1408,7 +1222,6 @@ export default {
if (x.data.titleColor) { if (x.data.titleColor) {
y.templateBg.titleColor = x.data.titleColor + " !important"; y.templateBg.titleColor = x.data.titleColor + " !important";
} }
// y.templateBg +="padding-bottom:"+(this.$uiConfig.is_bang ? '88px' : '60px')+";box-sizing: border-box;";
} }
}); });
if (!y.templateBg) { if (!y.templateBg) {
...@@ -1417,70 +1230,11 @@ export default { ...@@ -1417,70 +1230,11 @@ export default {
}; };
} }
}); });
// this.myPageData.home_pages.navs[0].template.data.push({
// id: "pintuan",
// permission_key: "pintuan",
// data: {
// buttonColor: "#ff4544",
// list: [
// {
// id: 179402,
// name:
// "日本POLA宝丽黑BA限定小礼盒（黑ba水20ml +黑ba乳液15ml +黑ba面霜5g +黑ba唇颊膏2g）",
// picUrl:
// "https://cdnimg.iotweixin.com/uploads/mall1285/20200506/904171cab7db2201f6f35c0ca5bb0a93.png",
// price: "388.00",
// peopleNum: 2,
// pintuanPrice: "348.00",
// },
// {
// id: 178355,
// name:
// "日本珂润（Curel）润浸保湿 滋养乳霜 40g 敏感肌专用 神经酰胺护理 抵抗外部刺激",
// picUrl:
// "https://cdnimg.iotweixin.com/uploads/mall1285/20200503/979653726a7bc1df0e24464f94b404bd.jpg",
// price: "180.00",
// peopleNum: 2,
// pintuanPrice: "180.00",
// },
// {
// id: 178352,
// name: "500g 干羊肚菌 干货 煲汤菌 菌中之王 包邮",
// picUrl:
// "https://cdnimg.iotweixin.com/uploads/mall1285/20200311/358dd9acf5dafd3cab2c05be3354400c.png",
// price: "780.00",
// peopleNum: 3,
// pintuanPrice: "680.00",
// },
// ],
// listStyle: 1,
// textStyle: 1,
// fill: 1,
// goodsCoverProportion: "1-1",
// goodsStyle: 1,
// showGoodsName: true,
// showBuyBtn: true,
// buyBtnStyle: 1,
// buyBtnText: "去拼团",
// showGoodsTag: false,
// customizeGoodsTag: false,
// goodsTagPicUrl: "",
// showImg: false,
// backgroundColor: "#fff",
// backgroundPicUrl: "",
// position: 5,
// mode: 1,
// backgroundHeight: 100,
// backgroundWidth: 100,
// borderBackground: "#ffffff",
// },
// });
}, },
getReceive() { getReceive() {
//分享进入调取领券接口 //分享进入调取领券接口
// 1-分享，2-购买并付款 // 1-分享，2-购买并付款
this.request2( this.request2({
{
url: "/api/AppletUser/ShareCoupon", url: "/api/AppletUser/ShareCoupon",
data: { data: {
TriggerType: 1, TriggerType: 1,
...@@ -1507,9 +1261,9 @@ export default { ...@@ -1507,9 +1261,9 @@ export default {
this.$refs.son[0].getSmallShopById(2); //第一次登陆成功后去调取微店的信息 this.$refs.son[0].getSmallShopById(2); //第一次登陆成功后去调取微店的信息
} }
this.getPageType(); //获取用户类型（校园） this.getPageType(); //获取用户类型（校园）
let IsOpenMiAi = uni.getStorageSync("basedata") let IsOpenMiAi = uni.getStorageSync("basedata") ?
? uni.getStorageSync("basedata").mall.setting.is_show_miai uni.getStorageSync("basedata").mall.setting.is_show_miai :
: 0; //是否开启相亲模式 5-13新加 0; //是否开启相亲模式 5-13新加
if (this.u.IsOpenSchool == 1 || IsOpenMiAi == 1) { if (this.u.IsOpenSchool == 1 || IsOpenMiAi == 1) {
this.init(); this.init();
} }
...@@ -1517,15 +1271,13 @@ export default { ...@@ -1517,15 +1271,13 @@ export default {
this.sharejump(); this.sharejump();
}, },
getPageType() { getPageType() {
this.request2( this.request2({
{
url: "/api/AppletUser/GetAppletUserPageType", url: "/api/AppletUser/GetAppletUserPageType",
data: {}, data: {},
}, },
(res) => { (res) => {
let mall_UserInfo = uni.getStorageSync("mall_UserInfo") let mall_UserInfo = uni.getStorageSync("mall_UserInfo") ?
? uni.getStorageSync("mall_UserInfo") uni.getStorageSync("mall_UserInfo") : {};
: {};
mall_UserInfo.IsOpenSchool = res.data.IsOpenSchool; mall_UserInfo.IsOpenSchool = res.data.IsOpenSchool;
mall_UserInfo.UserPageType = res.data.UserPageType; mall_UserInfo.UserPageType = res.data.UserPageType;
uni.setStorageSync("mall_UserInfo", mall_UserInfo); uni.setStorageSync("mall_UserInfo", mall_UserInfo);
...@@ -1543,8 +1295,7 @@ export default { ...@@ -1543,8 +1295,7 @@ export default {
}, },
goguidecar() { goguidecar() {
uni.navigateTo({ uni.navigateTo({
url: url: "/pages/guidecar/guidecarGoodsdetails?GoodsId=" +
"/pages/guidecar/guidecarGoodsdetails?GoodsId=" +
this.guidecar.GoodsId + this.guidecar.GoodsId +
"&address=" + "&address=" +
this.guidecar.address + this.guidecar.address +
...@@ -1579,20 +1330,20 @@ export default { ...@@ -1579,20 +1330,20 @@ export default {
}); });
}, },
}, },
}; };
</script> </script>
<style> <style>
.content { .content {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
width: 100%; width: 100%;
overflow-x: hidden; overflow-x: hidden;
/* align-items: center; /* align-items: center;
justify-content: center; */ justify-content: center; */
} }
.content .tips_t { .content .tips_t {
position: fixed; position: fixed;
right: 6px; right: 6px;
...@@ -1605,9 +1356,9 @@ export default { ...@@ -1605,9 +1356,9 @@ export default {
font-size: 12px; font-size: 12px;
margin-top: 10px; margin-top: 10px;
z-index: 9999999; z-index: 9999999;
} }
.triangle-up { .triangle-up {
width: 0; width: 0;
height: 0; height: 0;
border-left: 10px solid transparent; border-left: 10px solid transparent;
...@@ -1615,9 +1366,9 @@ export default { ...@@ -1615,9 +1366,9 @@ export default {
border-bottom: 12px solid black; border-bottom: 12px solid black;
position: fixed; position: fixed;
right: 65px; right: 65px;
} }
.index-title { .index-title {
line-height: 45px !important; line-height: 45px !important;
font-size: 16px; font-size: 16px;
text-align: center; text-align: center;
...@@ -1628,14 +1379,15 @@ export default { ...@@ -1628,14 +1379,15 @@ export default {
color: #fff; color: #fff;
box-sizing: content-box; box-sizing: content-box;
z-index: 5; z-index: 5;
} }
.back-arrow { .back-arrow {
position: absolute; position: absolute;
left: 5px; left: 5px;
bottom: 12.5px; bottom: 12.5px;
} }
.Startbtn {
.Startbtn {
position: absolute; position: absolute;
top: 10px; top: 10px;
right: 15px; right: 15px;
...@@ -1647,12 +1399,14 @@ export default { ...@@ -1647,12 +1399,14 @@ export default {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
color: #fff; color: #fff;
} }
.MainTopLeft {
.MainTopLeft {
text-align: left !important; text-align: left !important;
padding-left: 10px; padding-left: 10px;
} }
/* .logo {
/* .logo {
height: 200rpx; height: 200rpx;
width: 200rpx; width: 200rpx;
margin-top: 200rpx; margin-top: 200rpx;
...@@ -1670,9 +1424,10 @@ export default { ...@@ -1670,9 +1424,10 @@ export default {
font-size: 36rpx; font-size: 36rpx;
color: #8f8f94; color: #8f8f94;
} */ } */
/* #ifdef MP-ALIPAY */ /* #ifdef MP-ALIPAY */
.indexpage{ .indexpage {
padding-bottom: 100rpx; padding-bottom: 100rpx;
} }
/* #endif */
/* #endif */
</style> </style>
pages/video/video.vue
View file @ 0c94d53d
<style> <style>
.nvideo_Page { .nvideo_Page {
width: 100%; width: 100%;
height: 100%; height: 98%;
} }
</style> </style>
<template> <template>
<view class="nvideo_Page"> <view class="nvideo_Page">
<view> <view class="container">
<playerVideo :videoUrl="videoUrl" :videoName="videoName" :videoCoverImg="videoCoverImg" :vWidth="vWidth" :vHeight="vHeight"></playerVideo> <!--播放按钮-->
<image v-if="!isPlay" class="play-img" @click="videoPlayed" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/v_pause.png"
mode=""></image>
<view class="videoTitle">{{videoName}}</view>
<video :show-center-play-btn="false" class="video-view" id="myVideo" ref="myVideo" :src="videoUrl" :poster="videoCoverImg"
:controls="controls" :show-loading="true" @timeupdate="handleTimeUpdate" @loadedmetadata="loadedmetadata"
@fullscreenchange="fullscreenchange" @play="playChange" @pause="pauseChange" @ended="ended" :autoplay="false">
<view class="videoControlsContainer flex justify-center">
<image v-if="!isPlay" class="play-icon" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/v_pause.png"
@click="videoPlayed" mode="aspectFill"></image>
<image v-else class="pause-icon" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/v_start.png"
@click="videoPause" mode="aspectFill"></image>
<view class="slideBox">
<!--slider自定义播放控件-->
<slider @changing="sliderDown" style="margin: 0;" :value="value" @change="sliderChange" activeColor="#FFFFFF"
backgroundColor="rgba(245, 245, 245, 0.45)" block-color="#F5F5F5" :block-size="14" />
</view>
<!--播放时间-->
<p class="custdownTime">{{computedTime(nowPlayTime)}}</p>
</view>
</video>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import playerVideo from "./components/player-video.vue"; //离线订单弹窗
export default { export default {
data() { data() {
return { return {
videoName: "", //视频名称 videoName: "", //视频名称
videoUrl: "", //视频地址 videoUrl: "", //视频地址
videoCoverImg: "", //封面图 videoCoverImg: "", //封面图
vid: "", //视频Id vid: "", //视频Id
vWidth: "", //视频宽 vWidth: "", //视频宽
vHeight: "", //视频高 vHeight: "", //视频高
videoPlay: 0,
videoContext: null,
videoDuration: 0, //总播放时长
isPlay: false, //判断是否播放
nowPlayTime: 0, //当前播放时间
value: 0, //当前滑块的值
controls: false, //是否隐藏默认控制器
isEnd: false, //播放是否结束
sliderAble: true,
isSliderIng: false
} }
}, },
components: { components: {
playerVideo
}, },
onReady() { onReady() {
}, },
onLoad(option) { onLoad(option) {
console.log("option", option); if (option && option.vId) {
if (option && option.vid) { this.vid = option.vId;
this.vid = option.vid;
this.getVideoInfo(); this.getVideoInfo();
} }
wx.showShareMenu({
withShareTicket: true,
menus: ["shareAppMessage", "shareTimeline"],
});
}, },
methods: { methods: {
getVideoInfo() { getVideoInfo() {
...@@ -83,8 +105,107 @@ ...@@ -83,8 +105,107 @@
url: "/pages/index/index" url: "/pages/index/index"
}); });
}, },
/**
* 播放
*/
videoPlayed() {
this.videoContext.play()
},
/**
* 暂停
*/
videoPause() {
this.videoContext.pause()
},
/**
* 滑块进行拖动进度播放
*/
sliderChange(e) {
this.isSliderIng = false
const t = e.detail.value / 100
this.videoContext.seek(t * this.videoDuration);
this.nowPlayTime = t * this.videoDuration
console.log(t * this.videoDuration);
},
/**
* 播放后触发方法，获得播放总时长
*/
handleTimeUpdate(e) {
// 设置滑块位置
if (!this.isEnd && !this.isSliderIng) {
this.value = this.nowPlayTime / this.videoDuration * 100
}
// 设置当前时间
this.nowPlayTime = e.detail.currentTime
// 首次获取到duration时存储它
if (this.videoDuration === 0 && e.detail.duration > 0) {
this.videoDuration = e.detail.duration;
}
},
/**
* 初始化获得视频总时长
*/
loadedmetadata(e) {
this.nowPlayTime = e.detail.duration
},
computedTime(minutesAndSeconds) {
let totalSeconds = Math.floor(minutesAndSeconds) * 60 + Math.round((minutesAndSeconds % 1) * 60);
let hours = Math.floor(totalSeconds / 3600);
let minutes = Math.floor((totalSeconds % 3600) / 60);
hours = hours.toString().padStart(2, '0');
minutes = minutes.toString().padStart(2, '0');
return `${hours}:${minutes}`;
},
/**
* 监听是否为全屏，默认控制器是否显示
*/
fullscreenchange(e) {
if (e.detail.fullScreen) {
this.controls = true
} else {
this.controls = false
}
},
/**
* 监听是否播放
*/
playChange() {
this.isPlay = true
this.isEnd = false
this.sliderAble = false
},
/**
* 监听是否暂停
*/
pauseChange() {
this.isPlay = false
this.sliderAble = true
},
/**
* 是否播放完毕
*/
ended(e) {
this.isEnd = true
this.isPlay = false
this.value = 0
this.videoContext.seek(0);
this.videoContext.pause();
},
/**
* 滑块滑动期间
*/
sliderDown(e) {
this.isSliderIng = true
const t = e.detail.value / 100
this.videoContext.seek(t * this.videoDuration);
this.nowPlayTime = t * this.videoDuration
}
},
mounted() {
this.videoContext = uni.createVideoContext('myVideo', this);
this.videoContext.stop();
}, },
mounted() {},
created() { created() {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: "视频分享" title: "视频分享"
...@@ -92,3 +213,73 @@ ...@@ -92,3 +213,73 @@
}, },
} }
</script> </script>
<style>
.container {
position: absolute;
}
.videoTitle {
width: 100%;
height: 200rpx;
position: absolute;
top: 10rpx;
left: 20rpx;
font-size: 25rpx;
color: white;
z-index: 1;
}
.play-img {
width: 114rpx;
height: 114rpx;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -62%);
z-index: 2;
}
.video-view {
width: 100vw;
height: 100vh;
}
.videoControlsContainer {
position: fixed;
left: 50%;
bottom: 60rpx;
transform: translateX(-50%);
display: flex;
justify-content: space-between;
align-items: center;
width: 704rpx;
height: 88rpx;
border-radius: 20rpx;
/* background: rgba(255, 255, 255, 0.5); */
/* backdrop-filter: blur(20rpx); */
padding: 0 31rpx;
box-sizing: border-box;
}
.play-icon {
padding-top: 4rpx;
width: 57rpx;
height: 57rpx;
}
.pause-icon {
padding-top: 4rpx;
width: 57rpx;
height: 57rpx;
}
.custdownTime {
font-size: 22rpx;
font-weight: normal;
color: white;
}
.slideBox {
width: 481rpx;
}
</style>
plugin/api.js
View file @ 0c94d53d
...@@ -28,7 +28,6 @@ export default { ...@@ -28,7 +28,6 @@ export default {
Vue.prototype.host2 = "https://erpmallapi.oytour.com" Vue.prototype.host2 = "https://erpmallapi.oytour.com"
Vue.prototype.host3 = "https://reborn.oytour.com" Vue.prototype.host3 = "https://reborn.oytour.com"
Vue.prototype.request = function(param, success, failed) { Vue.prototype.request = function(param, success, failed) {
//网络请求 //网络请求
uni.request({ uni.request({
......
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