Browse Source

和线上代码同步,本版本不同步给左都辉

master
liutong 1 year ago
parent
commit
ab9144f1ec
  1. BIN
      ci/shenbeitang(2).mobileprovision
  2. BIN
      ci/shenbeitang(2).p12
  3. 5
      common/js/diy.js
  4. 28
      config/componentConfig.js
  5. 6
      config/production.js
  6. 6
      manifest.json
  7. 6
      page_goods/components/common-payment/common-payment.vue
  8. 7
      page_goods/components/common-payment/payment.js
  9. 3
      page_goods/orderDetail/public/js/orderMethod.js
  10. 3
      page_goods/public/js/orderMethod.js
  11. 2
      page_salesman_index/index/beconfirmed.vue
  12. 1
      page_salesman_index/index/reviewed.vue
  13. 6
      page_salesman_order/Order_details/Order_details.vue
  14. 3
      page_salesman_order/undgbm/undgbm.vue
  15. 8
      pages.json
  16. 20
      pages/index/index.vue
  17. 10
      pages/init.vue
  18. 22
      pages/order/list.vue
  19. 33
      pages_tool/invoice/invoice.vue

BIN
ci/shenbeitang(2).mobileprovision

Binary file not shown.

BIN
ci/shenbeitang(2).p12

Binary file not shown.

5
common/js/diy.js

@ -264,8 +264,6 @@ export default {
is_default: this.isDefault is_default: this.isDefault
}, },
success: res => { success: res => {
// console.log(JSON.parse(res.data.value));
// console.log(JSON.parse(res.data.value),`diy`);
if (res.code != 0 || !res.data) { if (res.code != 0 || !res.data) {
if (this.$refs.loadingCover) this.$refs.loadingCover.hide(); if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
this.diyData = {}; this.diyData = {};
@ -279,7 +277,6 @@ export default {
if (diyDatavalue.value) { if (diyDatavalue.value) {
// uni.setStorageSync(this.name, diyDatavalue.value); // uni.setStorageSync(this.name, diyDatavalue.value);
this.diyData = JSON.parse(diyDatavalue.value); this.diyData = JSON.parse(diyDatavalue.value);
console.log(this.diyData);
this.diyData.compExtend = diyDatavalue.comp_extend; // 自定义扩展组件 this.diyData.compExtend = diyDatavalue.comp_extend; // 自定义扩展组件
this.$langConfig.title(this.diyData.global.title); this.$langConfig.title(this.diyData.global.title);
this.mpCollect = this.diyData.global.mpCollect; this.mpCollect = this.diyData.global.mpCollect;
@ -392,7 +389,7 @@ export default {
this.getDiyInfo(); this.getDiyInfo();
this.$refs.diyGroup.$refs.ManyGoodsList[0].$refs.diyGoodsList.getGoodsList(); this.$refs.diyGroup.$refs.ManyGoodsList[0].$refs.diyGoodsList.getGoodsList();
}) })
this.$refs.uniPopupWindow.open(); // this.$refs.uniPopupWindow.open();
} }
}, },
onReachBottom() { onReachBottom() {

28
config/componentConfig.js

@ -36,12 +36,18 @@ export default {
teamId = updateConfig.teamId teamId = updateConfig.teamId
baseURL = updateConfig.ipConfig baseURL = updateConfig.ipConfig
} }
console.log(`${baseURL}/api/app/checkupdate/${teamId}/${platform}/${bundleID}/${version.versionCode}`, // console.log(111, `${baseURL}/api/app/checkupdate/${teamId}/${platform}/${bundleID}/${version.versionCode}`,
'################################'); // '################################');
const res = await requestGet( // const res = await requestGet(
`${baseURL}/api/app/checkupdate/${teamId}/${platform}/${bundleID}/${version.versionCode}`).then( // `${baseURL}/api/app/checkupdate/${teamId}/${platform}/${bundleID}/${version.versionCode}`).then(
res => res.data) // res => res.data)
console.log(res);
const res = await requestGet(`https://cbtadmin.jtyqt.com/api/config/checkupdate`).then(
res => {
console.log('====>', res);
return res.data
})
const returnRes = { const returnRes = {
versionCode: '', // int 版本号 versionCode: '', // int 版本号
versionName: '', // String 版本名称 versionName: '', // String 版本名称
@ -49,8 +55,7 @@ export default {
updateType: '', // String forcibly = 强制更新, solicit = 弹窗确认更新, silent = 静默更新 updateType: '', // String forcibly = 强制更新, solicit = 弹窗确认更新, silent = 静默更新
downloadUrl: '' // String 版本下载链接(IOS安装包更新请放跳转store应用商店链接,安卓apk和wgt文件放文件下载链接) downloadUrl: '' // String 版本下载链接(IOS安装包更新请放跳转store应用商店链接,安卓apk和wgt文件放文件下载链接)
}; };
if (Number(res.data.versionCode) <= version.versionCode) {
if (!res || !res.success) {
// 不提示 // 不提示
if (!isPrompt) return if (!isPrompt) return
if (isCustom) { if (isCustom) {
@ -70,17 +75,16 @@ export default {
normal: 'solicit', normal: 'solicit',
silent: 'silent' silent: 'silent'
} }
const versionData = res.data.version // const versionData = res.data.version
const versionData = res.data
// versionData.updateMode = 'force'
returnRes.versionCode = Number(versionData.versionCode) returnRes.versionCode = Number(versionData.versionCode)
returnRes.versionName = versionData.versionStr returnRes.versionName = versionData.versionStr
returnRes.versionInfo = versionData.changelog || '' returnRes.versionInfo = versionData.changelog || ''
returnRes.updateType = updateMode2Type[versionData.updateMode] ? updateMode2Type[versionData returnRes.updateType = updateMode2Type[versionData.updateMode] ? updateMode2Type[versionData
.updateMode] : 'solicit' .updateMode] : 'solicit'
returnRes.downloadUrl = versionData.installUrl returnRes.downloadUrl = versionData.installUrl
console.log(returnRes);
console.log(returnRes, 'returnRes');
// 兼容之前的版本 // 兼容之前的版本
return callback && callback(returnRes); return callback && callback(returnRes);

6
config/production.js

@ -4,13 +4,11 @@
// api请求地址 // api请求地址
// export const baseUrl = 'https://cbtadmin.jtyqt.com' // export const baseUrl = 'https://cbtadmin.jtyqt.com'
// export const baseUrl = 'https://yaochangtest.first.xinzhidi.cn'//测试地址1 export const baseUrl = 'https://cbtadmin.jtyqt.com'
export const baseUrl = 'http://devzhiyao.zeyan.wang'//测试地址2
// 图片域名 // 图片域名
// export const imgDomain='https://cbtadmin.jtyqt.com' // export const imgDomain='https://cbtadmin.jtyqt.com'
// export const imgDomain = 'https://yaochangtest.first.xinzhidi.cn'//测试地址1 export const imgDomain = 'https://cbtadmin.jtyqt.com'
export const imgDomain = 'http://devzhiyao.zeyan.wang'//测试地址2
// 极光推送 // 极光推送
export const PUSHCONFIG = { export const PUSHCONFIG = {

6
manifest.json

@ -1,9 +1,9 @@
{ {
"name" : "齐采药", "name" : "齐采药",
"appid" : "__UNI__9C80A8A", "appid" : "__UNI__9009737",
"description" : "", "description" : "",
"versionName" : "1.000.188", "versionName" : "1.000.1243",
"versionCode" : 10001234, "versionCode" : 10001243,
"transformPx" : false, "transformPx" : false,
"app-plus" : { "app-plus" : {
"compatible" : { "compatible" : {

6
page_goods/components/common-payment/common-payment.vue

@ -412,7 +412,7 @@
<u-switch v-model="is_invoice" :activeValue="1" activeColor="var(--base-color)" <u-switch v-model="is_invoice" :activeValue="1" activeColor="var(--base-color)"
:inactiveValue="0" @change="change"></u-switch> :inactiveValue="0" @change="change"></u-switch>
</view> </view>
<!-- <view class="site-wrap buy-one-bytheway"> <view class="site-wrap buy-one-bytheway" v-if="buyOneGoodsData">
<view class="headerline"> <view class="headerline">
<view class="title">顺手买一件</view> <view class="title">顺手买一件</view>
<view @click="handleChangeBuyOne" class="change"> <view @click="handleChangeBuyOne" class="change">
@ -422,7 +422,7 @@
</view> </view>
<view class="goodsContent"> <view class="goodsContent">
<view class="image"> <view class="image">
<img :src="buyOneGoodsData.goods_image.split(',')[0]" mode="aspectFill" /> <img :src="buyOneGoodsData && buyOneGoodsData.goods_image.split(',')[0]" mode="aspectFill" />
</view> </view>
<view class="right"> <view class="right">
<view class="contnent"> <view class="contnent">
@ -441,7 +441,7 @@
</view> </view>
</view> </view>
</view> </view>
</view> --> </view>
<!-- <view v-if="false" class="site-wrap buyer-message df aic jcsb" @click="btn"> <!-- <view v-if="false" class="site-wrap buyer-message df aic jcsb" @click="btn">
<div class="tit">发票</div> <div class="tit">发票</div>
<image class="imgar" :src="$util.img('/upload/weapp/user/arrow-right.png')" mode=""></image> <image class="imgar" :src="$util.img('/upload/weapp/user/arrow-right.png')" mode=""></image>

7
page_goods/components/common-payment/payment.js

@ -193,6 +193,13 @@ export default {
} }
}, },
handleChangeBuyOne() { handleChangeBuyOne() {
if(this.buyOnetotal === 1) {
uni.showToast({
title: '没有更多了~',
icon: 'none'
})
return;
}
this.buyOnePageNum += 1; this.buyOnePageNum += 1;
this.getBuyOneInfo(); this.getBuyOneInfo();
this.isCheckedBuyOne = [] this.isCheckedBuyOne = []

3
page_goods/orderDetail/public/js/orderMethod.js

@ -10,8 +10,7 @@ export default {
} else { } else {
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
// content: '商家已将支付金额调整为' + orderData.pay_money + '元,是否继续支付?', content: '商家已将支付金额调整为' + orderData.pay_money + '元,是否继续支付?',
content: `商家已将支付金额调整为${orderData.pay_money}元,还需支付${orderData.pay.pay_money}元,是否继续支付?`,
success: res => { success: res => {
if (res.confirm) { if (res.confirm) {
this.pay(); this.pay();

3
page_goods/public/js/orderMethod.js

@ -10,7 +10,8 @@ export default {
} else { } else {
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '商家已将支付金额调整为' + orderData.pay_money + '元,是否继续支付?', // content: '商家已将支付金额调整为' + orderData.pay_money + '元,是否继续支付?',
content: `商家已将支付金额调整为${orderData.pay_money}元,还需支付${orderData.pay.pay_money}元,是否继续支付?`,
success: res => { success: res => {
if (res.confirm) { if (res.confirm) {
this.pay(); this.pay();

2
page_salesman_index/index/beconfirmed.vue

@ -253,7 +253,7 @@
.list { .list {
margin: 42rpx 24rpx 0 24rpx; margin: 42rpx 24rpx 0 24rpx;
width: 702rpx; width: 702rpx;
//height: 424rpx; height: 480rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 24rpx; border-radius: 24rpx;
// padding: 32rpx; // padding: 32rpx;

1
page_salesman_index/index/reviewed.vue

@ -346,6 +346,7 @@
margin: 42rpx 24rpx 0 24rpx; margin: 42rpx 24rpx 0 24rpx;
width: 702rpx; width: 702rpx;
//height: 424rpx; //height: 424rpx;
height: 480rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 24rpx; border-radius: 24rpx;
// padding: 32rpx; // padding: 32rpx;

6
page_salesman_order/Order_details/Order_details.vue

@ -1,8 +1,14 @@
<template> <template>
<z-paging ref="paging" v-model="list" @query="queryList"> <z-paging ref="paging" v-model="list" @query="queryList">
<!-- #ifdef H5 -->
<u-navbar title="订单详情" leftIconSize="0" @leftClick="leftClick" placeholder> <u-navbar title="订单详情" leftIconSize="0" @leftClick="leftClick" placeholder>
<u-icon name="arrow-left" slot="left" color="#333333" size="24"></u-icon> <u-icon name="arrow-left" slot="left" color="#333333" size="24"></u-icon>
</u-navbar> </u-navbar>
<!-- #endif -->
<!-- #ifdef APP-PLUS -->
<view style="padding-top: 50rpx">
</view>
<!-- #endif -->
<view class="" v-for="(item,index) in list" :key="index"> <view class="" v-for="(item,index) in list" :key="index">
<view class="Order-details"> <view class="Order-details">
<view class="Order-status"> <view class="Order-status">

3
page_salesman_order/undgbm/undgbm.vue

@ -302,7 +302,7 @@
.list { .list {
margin: 42rpx 24rpx 0 24rpx; margin: 42rpx 24rpx 0 24rpx;
width: 702rpx; width: 702rpx;
//height: 424rpx; height: 480rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 24rpx; border-radius: 24rpx;
// padding: 32rpx; // padding: 32rpx;
@ -450,6 +450,7 @@
.list-btn { .list-btn {
margin-top: 32rpx; margin-top: 32rpx;
// height: 500rpx !important;
.listone { .listone {
width: 176rpx; width: 176rpx;

8
pages.json

@ -2101,10 +2101,10 @@
"pagePath": "pages/index/index", "pagePath": "pages/index/index",
"text": "首页" "text": "首页"
}, },
// { {
// "pagePath": "page_video/video/index", "pagePath": "page_video/video/index",
// "text": "视频" "text": "视频"
// }, },
{ {
"pagePath": "pages/goods/category", "pagePath": "pages/goods/category",
"text": "分类" "text": "分类"

20
pages/index/index.vue

@ -1,6 +1,7 @@
<template> <template>
<page-meta :page-style="themeColor"></page-meta> <page-meta :page-style="themeColor"></page-meta>
<view :style="{ backgroundColor: bgColor, minHeight: 'calc(100vh )' }" class="page-img"> <view :style="{ backgroundColor: bgColor, minHeight: 'calc(100vh )' }" class="page-img">
<!-- 自定义组件 --> <!-- 自定义组件 -->
@ -91,6 +92,9 @@
import diyJs from '@/common/js/diy.js'; import diyJs from '@/common/js/diy.js';
import indexJs from './public/js/index.js'; import indexJs from './public/js/index.js';
import APPUpdate from '@/config/appUpdate.js'; import APPUpdate from '@/config/appUpdate.js';
import {
getCurrentNo
} from '@/config/appUpdate.js'
export default { export default {
components: { components: {
uniPopup uniPopup
@ -108,7 +112,8 @@
}, },
site_tel: '', site_tel: '',
diyGlobalData: {}, diyGlobalData: {},
floatData: {} floatData: {},
}; };
}, },
onLoad() { onLoad() {
@ -130,8 +135,21 @@
}, },
onShow() { onShow() {
// uni.$emit('videoStart') // uni.$emit('videoStart')
this.getSystem()
}, },
methods: { methods: {
getSystem() {
//#ifdef APP-PLUS
getCurrentNo(({
versionCode,
versionName
}) => {
console.log('========versionCode', versionName);
console.log('========versionCode', versionCode);
})
//#endif
},
goRouter(data) { goRouter(data) {
uni.navigateTo({ uni.navigateTo({
url: data.link.wap_url url: data.link.wap_url

10
pages/init.vue

@ -5,7 +5,7 @@
<image :src="item.adv_image" mode="aspectFill" class="cover" @click="goPage(item)"></image> <image :src="item.adv_image" mode="aspectFill" class="cover" @click="goPage(item)"></image>
</swiper-item> </swiper-item>
</swiper> </swiper>
<view class="init-skip" @click="handleJump">跳过{{ time }}s</view> <view class="init-skip" @click="handleJump" v-if="showgg">跳过{{ time }}s</view>
</div> </div>
</template> </template>
<script> <script>
@ -13,6 +13,7 @@
name: "init", name: "init",
data() { data() {
return { return {
showgg:false,
info: {}, info: {},
dataList: [], dataList: [],
current: 0, current: 0,
@ -22,7 +23,7 @@
}, },
onLoad(e) { onLoad(e) {
this.getComAdvertising() this.getComAdvertising()
this.handleJump() // this.handleJump()
this.timer = setInterval(() => { this.timer = setInterval(() => {
if (this.time > 0) { if (this.time > 0) {
this.time-- this.time--
@ -61,8 +62,9 @@
url: '/api/adv/appstartadvlist', url: '/api/adv/appstartadvlist',
data: {}, data: {},
success: res => { success: res => {
console.log(res, 'res') if (res.code==0&&res.data.data.length!=0) {
if (!res.code) { console.log('-------------广告',res.data.data)
this.showgg = true
this.dataList = res.data.data this.dataList = res.data.data
} else { } else {
this.handleJump() this.handleJump()

22
pages/order/list.vue

@ -172,10 +172,10 @@
@click="operation(operationItem.action, orderItem)"> @click="operation(operationItem.action, orderItem)">
{{ operationItem.title }} {{ operationItem.title }}
</view> </view>
<view class="order-box-btn color-base-border color-base-text" v-if="!orderItem.is_invoice" <!-- <view class="order-box-btn color-base-border color-base-text" v-if="!orderItem.is_invoice"
@click="openInvoice(orderItem)"> @click="openInvoice(orderItem)">
申请开票 申请开票
</view> </view> -->
</view> </view>
@ -189,10 +189,10 @@
<text v-if="orderItem.evaluate_status == 0">评价</text> <text v-if="orderItem.evaluate_status == 0">评价</text>
<text v-else-if="orderItem.evaluate_status == 1">追评</text> <text v-else-if="orderItem.evaluate_status == 1">追评</text>
</view> </view>
<view class="order-box-btn color-base-border color-base-text" v-if="!orderItem.is_invoice" <!-- <view class="order-box-btn color-base-border color-base-text" v-if="!orderItem.is_invoice"
@click="openInvoice(orderItem)"> @click="openInvoice(orderItem)">
申请开票 申请开票
</view> </view> -->
<!-- <view class="order-box-btn color-base-border color-base-text" <!-- <view class="order-box-btn color-base-border color-base-text"
@click="getInvoice(orderItem)" @click="getInvoice(orderItem)"
v-if="orderItem.is_invoice&&orderItem.invoice_status"> v-if="orderItem.is_invoice&&orderItem.invoice_status">
@ -219,10 +219,10 @@
查看发票 查看发票
</view> </view>
<view class="order-box-btn color-base-border color-base-text" v-if="!orderItem.is_invoice" <!-- <view class="order-box-btn color-base-border color-base-text" v-if="!orderItem.is_invoice"
@click="openInvoice(orderItem)"> @click="openInvoice(orderItem)">
申请开票 申请开票
</view> </view> -->
</view> </view>
@ -472,11 +472,11 @@
name: this.$lang('waitDelivery'), name: this.$lang('waitDelivery'),
id: 'status_3' id: 'status_3'
}, },
{ // {
status: 'invoice', // status: 'invoice',
name: '待开票', // name: '',
id: 'invoice' // id: 'invoice'
}, // },
{ {
status: 'waitrate', status: 'waitrate',
name: this.$lang('waitEvaluate'), name: this.$lang('waitEvaluate'),

33
pages_tool/invoice/invoice.vue

@ -37,6 +37,9 @@
<view class="" v-if="orderItem.invoice_status==0&&orderItem.is_invoice==1"> <view class="" v-if="orderItem.invoice_status==0&&orderItem.is_invoice==1">
待审核 待审核
</view> </view>
<view class="apply-ticket" v-if="orderItem.is_invoice === 0" @click="handleApplyTicket(orderItem)">
申请开票
</view>
<view class="" v-else-if="orderItem.invoice_status==1&&orderItem.is_invoice==1"> <view class="" v-else-if="orderItem.invoice_status==1&&orderItem.is_invoice==1">
已开票 已开票
</view> </view>
@ -127,13 +130,18 @@
name: '待开票', name: '待开票',
} }
], ],
curTab: 1 curTab: 1,
applyTicketOrderId: 0 // id
} }
}, },
onShow() { onShow() {
if (this.$refs.mescroll) this.$refs.mescroll.refresh(); if (this.$refs.mescroll) this.$refs.mescroll.refresh();
}, },
methods: { methods: {
handleApplyTicket(item) {
this.applyTicketOrderId = item.order_id;
this.show = true;
},
handleChangeTab(id) { handleChangeTab(id) {
// tab // tab
if(this.curTab === id){ if(this.curTab === id){
@ -156,7 +164,8 @@
page_size: mescroll.size, page_size: mescroll.size,
order_status: "all", order_status: "all",
invoice_status: this.curTab, invoice_status: this.curTab,
invoice: 1 // invoice: 1
invoice: 3 //
}, },
success: res => { success: res => {
let newArr = []; let newArr = [];
@ -191,16 +200,17 @@
this.dataList[index].changer = !this.dataList[index].changer; this.dataList[index].changer = !this.dataList[index].changer;
}, },
confirmDoInvoice() { confirmDoInvoice() {
let arr = [] // let arr = []
this.dataList.forEach(item => { // this.dataList.forEach(item => {
if (item.changer) { // if (item.changer) {
arr.push(item.order_id) // arr.push(item.order_id)
} // }
}) // })
this.$api.sendRequest({ this.$api.sendRequest({
url: "/api/order/doInvoice", url: "/api/order/doInvoice",
data: { data: {
order_id: arr[0] // order_id: arr[0]
order_id: this.applyTicketOrderId
}, },
success: res => { success: res => {
this.$util.showToast({ this.$util.showToast({
@ -221,7 +231,7 @@
}) })
this.selectCurrentPage = !this.selectCurrentPage this.selectCurrentPage = !this.selectCurrentPage
}, },
invoiceShow() { invoiceShow(orderItem) {
let arr = [] let arr = []
this.dataList.forEach(item => { this.dataList.forEach(item => {
if (item.changer) { if (item.changer) {
@ -736,7 +746,8 @@
} }
} }
.topBtn { .topBtn,
.apply-ticket{
background-color: #21BBF3; background-color: #21BBF3;
color: #fff; color: #fff;
padding: 5rpx 20rpx; padding: 5rpx 20rpx;

Loading…
Cancel
Save