Merge branch 'master' of https://gitee.com/wjl2008_admin/medicine_app
This commit is contained in:
liuyuan
@@ -373,7 +373,18 @@
|
||||
>苹果支付</span
|
||||
>
|
||||
<span style="color: #666" v-if="orderContet.paymentMethod == 4"
|
||||
>天医币支付</span
|
||||
>
|
||||
|
||||
<template v-if="orderContet.orderType == 'point'&&orderContet.bookBuyConfigEntity.realMoney>0">
|
||||
天医币支付<text v-if="orderContet.jfDeduction>0"> + 积分抵扣</text>
|
||||
</template>
|
||||
<template v-else-if="orderContet.realMoney">
|
||||
天医币支付 <text v-if="orderContet.jfDeduction>0"> + 积分抵扣</text>
|
||||
</template>
|
||||
<template v-else-if="orderContet.jfDeduction>0">
|
||||
积分抵扣
|
||||
</template>
|
||||
</span
|
||||
></text
|
||||
>
|
||||
</view>
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
</view>
|
||||
<view class="vip_price" v-if="item.yanqiList&&item.yanqiList.length>0">
|
||||
<text class="font_bold">延期价格：</text>
|
||||
<text class="vip_price_v" v-for="(item_yq, index_yq) in item.yanqiList" :key="index_yq" @click="openorderModal(item_yq,1)">
|
||||
<text class="vip_price_v" v-for="(item_yq, index_yq) in item.yanqiList" :key="index_yq" @click="openorderModal({state:item.state,...item_yq},1)">
|
||||
{{item_yq.year}}年<text>{{item_yq.rebateFee}}</text>元
|
||||
</text>
|
||||
</view>
|
||||
@@ -118,6 +118,7 @@ export default{
|
||||
},
|
||||
//点击购买
|
||||
openorderModal(item,type) {
|
||||
console.log('item at line 120:', item)
|
||||
if(this.$platform=='ios'){
|
||||
return false
|
||||
}
|
||||
|
||||
@@ -723,6 +723,7 @@ export default {
|
||||
this.dataInfo.lastFee = item.rebateFee;
|
||||
this.dataInfo.id = item.id;
|
||||
if (this.initData.user && this.initData.user.jf) {
|
||||
this.jfNumber=0
|
||||
var totalMoney = this.dataInfo.lastFee;
|
||||
if (this.initData.user.jf >= totalMoney) {
|
||||
const integerPart = Math.floor(totalMoney);
|
||||
@@ -731,6 +732,7 @@ export default {
|
||||
} else {
|
||||
this.jfNumberMax = this.initData.user.jf; // 设置 jfNumberMax
|
||||
}
|
||||
|
||||
}
|
||||
this.$forceUpdate();
|
||||
},
|
||||
|
||||
12
unpackage/dist/build/app-plus/app-service.js
vendored
12
unpackage/dist/build/app-plus/app-service.js
vendored
File diff suppressed because one or more lines are too long
6
unpackage/dist/build/app-plus/app-view.js
vendored
6
unpackage/dist/build/app-plus/app-view.js
vendored
File diff suppressed because one or more lines are too long
207
unpackage/dist/dev/app-plus/app-service.js
vendored
207
unpackage/dist/dev/app-plus/app-service.js
vendored
File diff suppressed because one or more lines are too long
177
unpackage/dist/dev/app-plus/app-view.js
vendored
177
unpackage/dist/dev/app-plus/app-view.js
vendored
@@ -42013,7 +42013,38 @@ var render = function () {
|
||||
staticStyle: { color: "#666" },
|
||||
attrs: { _i: 104 },
|
||||
},
|
||||
[_vm._v("天医币支付")]
|
||||
[
|
||||
_vm._$g(105, "i")
|
||||
? [
|
||||
_vm._v("天医币支付"),
|
||||
_vm._$g(106, "i")
|
||||
? _c(
|
||||
"v-uni-text",
|
||||
{
|
||||
attrs: { _i: 106 },
|
||||
},
|
||||
[_vm._v("+ 积分抵扣")]
|
||||
)
|
||||
: _vm._e(),
|
||||
]
|
||||
: _vm._$g(107, "e")
|
||||
? [
|
||||
_vm._v("天医币支付"),
|
||||
_vm._$g(108, "i")
|
||||
? _c(
|
||||
"v-uni-text",
|
||||
{
|
||||
attrs: { _i: 108 },
|
||||
},
|
||||
[_vm._v("+ 积分抵扣")]
|
||||
)
|
||||
: _vm._e(),
|
||||
]
|
||||
: _vm._$g(109, "e")
|
||||
? [_vm._v("积分抵扣")]
|
||||
: _vm._e(),
|
||||
],
|
||||
2
|
||||
)
|
||||
: _vm._e(),
|
||||
],
|
||||
@@ -42033,7 +42064,7 @@ var render = function () {
|
||||
"uni-view",
|
||||
{
|
||||
staticStyle: { "text-align": "center", width: "100%" },
|
||||
attrs: { _i: 105 },
|
||||
attrs: { _i: 110 },
|
||||
},
|
||||
[
|
||||
_c(
|
||||
@@ -42043,7 +42074,7 @@ var render = function () {
|
||||
color: "cadetblue",
|
||||
"font-size": "26rpx",
|
||||
},
|
||||
attrs: { _i: 106 },
|
||||
attrs: { _i: 111 },
|
||||
on: {
|
||||
click: function ($event) {
|
||||
return _vm.$handleViewEvent($event)
|
||||
@@ -42064,10 +42095,10 @@ var render = function () {
|
||||
),
|
||||
_c(
|
||||
"uni-view",
|
||||
{ staticClass: _vm._$g(107, "sc"), attrs: { _i: 107 } },
|
||||
{ staticClass: _vm._$g(112, "sc"), attrs: { _i: 112 } },
|
||||
[
|
||||
_c("common-goods-nav", {
|
||||
attrs: { _i: 108 },
|
||||
attrs: { _i: 113 },
|
||||
on: {
|
||||
submit: function ($event) {
|
||||
return _vm.$handleViewEvent($event)
|
||||
@@ -42081,47 +42112,47 @@ var render = function () {
|
||||
key: "leftSlot",
|
||||
fn: function (slotProps, _svm, _si) {
|
||||
return [
|
||||
_svm._$g("110-" + _si, "i")
|
||||
_svm._$g("115-" + _si, "i")
|
||||
? _c(
|
||||
"uni-view",
|
||||
{
|
||||
staticClass: _svm._$g("110-" + _si, "sc"),
|
||||
attrs: { _i: "110-" + _si },
|
||||
staticClass: _svm._$g("115-" + _si, "sc"),
|
||||
attrs: { _i: "115-" + _si },
|
||||
},
|
||||
[
|
||||
_c(
|
||||
"v-uni-text",
|
||||
{
|
||||
staticClass: _svm._$g("111-" + _si, "sc"),
|
||||
attrs: { _i: "111-" + _si },
|
||||
staticClass: _svm._$g("116-" + _si, "sc"),
|
||||
attrs: { _i: "116-" + _si },
|
||||
},
|
||||
[
|
||||
_vm._v("合计:"),
|
||||
_svm._$g("112-" + _si, "i")
|
||||
_svm._$g("117-" + _si, "i")
|
||||
? _c(
|
||||
"v-uni-text",
|
||||
{
|
||||
staticClass: _svm._$g(
|
||||
"112-" + _si,
|
||||
"117-" + _si,
|
||||
"sc"
|
||||
),
|
||||
attrs: { _i: "112-" + _si },
|
||||
attrs: { _i: "117-" + _si },
|
||||
},
|
||||
[
|
||||
_vm._v(
|
||||
"￥ " + _svm._$g("112-" + _si, "t0-0")
|
||||
"￥ " + _svm._$g("117-" + _si, "t0-0")
|
||||
),
|
||||
]
|
||||
)
|
||||
: _c(
|
||||
"v-uni-text",
|
||||
{
|
||||
staticClass: _svm._$g(113, "sc"),
|
||||
attrs: { _i: 113 },
|
||||
staticClass: _svm._$g(118, "sc"),
|
||||
attrs: { _i: 118 },
|
||||
},
|
||||
[
|
||||
_vm._v(
|
||||
"￥" + _svm._$g("113-" + _si, "t0-0")
|
||||
"￥" + _svm._$g("118-" + _si, "t0-0")
|
||||
),
|
||||
]
|
||||
),
|
||||
@@ -42143,7 +42174,7 @@ var render = function () {
|
||||
_c(
|
||||
"u-popup",
|
||||
{
|
||||
attrs: { _i: 114 },
|
||||
attrs: { _i: 119 },
|
||||
on: {
|
||||
close: function ($event) {
|
||||
return _vm.$handleViewEvent($event)
|
||||
@@ -42153,17 +42184,17 @@ var render = function () {
|
||||
[
|
||||
_c(
|
||||
"uni-view",
|
||||
{ staticClass: _vm._$g(115, "sc"), attrs: { _i: 115 } },
|
||||
{ staticClass: _vm._$g(120, "sc"), attrs: { _i: 120 } },
|
||||
[
|
||||
_vm._$g(116, "i")
|
||||
_vm._$g(121, "i")
|
||||
? _c(
|
||||
"uni-view",
|
||||
{ staticClass: _vm._$g(116, "sc"), attrs: { _i: 116 } },
|
||||
{ staticClass: _vm._$g(121, "sc"), attrs: { _i: 121 } },
|
||||
[_vm._v("添加评价")]
|
||||
)
|
||||
: _c(
|
||||
"uni-view",
|
||||
{ staticClass: _vm._$g(117, "sc"), attrs: { _i: 117 } },
|
||||
{ staticClass: _vm._$g(122, "sc"), attrs: { _i: 122 } },
|
||||
[_vm._v("添加追评")]
|
||||
),
|
||||
_c(
|
||||
@@ -42173,29 +42204,29 @@ var render = function () {
|
||||
"max-height": "1000rpx",
|
||||
"overflow-y": "scroll",
|
||||
},
|
||||
attrs: { _i: 118 },
|
||||
attrs: { _i: 123 },
|
||||
},
|
||||
[
|
||||
_c("uni-forms", { attrs: { _i: 119 } }),
|
||||
_c("uni-forms", { attrs: { _i: 124 } }),
|
||||
_c(
|
||||
"uni-view",
|
||||
{
|
||||
staticClass: _vm._$g(120, "sc"),
|
||||
staticClass: _vm._$g(125, "sc"),
|
||||
staticStyle: { "border-bottom": "1px solid #eeeeee" },
|
||||
attrs: { _i: 120 },
|
||||
attrs: { _i: 125 },
|
||||
},
|
||||
[
|
||||
_vm._$g(121, "i")
|
||||
_vm._$g(126, "i")
|
||||
? _c(
|
||||
"uni-view",
|
||||
{
|
||||
staticClass: _vm._$g(121, "sc"),
|
||||
attrs: { _i: 121 },
|
||||
staticClass: _vm._$g(126, "sc"),
|
||||
attrs: { _i: 126 },
|
||||
},
|
||||
[
|
||||
_c("span", {
|
||||
class: _vm._$g(122, "c"),
|
||||
attrs: { _i: 122 },
|
||||
class: _vm._$g(127, "c"),
|
||||
attrs: { _i: 127 },
|
||||
on: {
|
||||
click: function ($event) {
|
||||
return _vm.$handleViewEvent($event)
|
||||
@@ -42203,8 +42234,8 @@ var render = function () {
|
||||
},
|
||||
}),
|
||||
_c("span", {
|
||||
class: _vm._$g(123, "c"),
|
||||
attrs: { _i: 123 },
|
||||
class: _vm._$g(128, "c"),
|
||||
attrs: { _i: 128 },
|
||||
on: {
|
||||
click: function ($event) {
|
||||
return _vm.$handleViewEvent($event)
|
||||
@@ -42212,8 +42243,8 @@ var render = function () {
|
||||
},
|
||||
}),
|
||||
_c("span", {
|
||||
class: _vm._$g(124, "c"),
|
||||
attrs: { _i: 124 },
|
||||
class: _vm._$g(129, "c"),
|
||||
attrs: { _i: 129 },
|
||||
on: {
|
||||
click: function ($event) {
|
||||
return _vm.$handleViewEvent($event)
|
||||
@@ -42221,8 +42252,8 @@ var render = function () {
|
||||
},
|
||||
}),
|
||||
_c("span", {
|
||||
class: _vm._$g(125, "c"),
|
||||
attrs: { _i: 125 },
|
||||
class: _vm._$g(130, "c"),
|
||||
attrs: { _i: 130 },
|
||||
on: {
|
||||
click: function ($event) {
|
||||
return _vm.$handleViewEvent($event)
|
||||
@@ -42230,8 +42261,8 @@ var render = function () {
|
||||
},
|
||||
}),
|
||||
_c("span", {
|
||||
class: _vm._$g(126, "c"),
|
||||
attrs: { _i: 126 },
|
||||
class: _vm._$g(131, "c"),
|
||||
attrs: { _i: 131 },
|
||||
on: {
|
||||
click: function ($event) {
|
||||
return _vm.$handleViewEvent($event)
|
||||
@@ -42242,16 +42273,16 @@ var render = function () {
|
||||
1
|
||||
)
|
||||
: _vm._e(),
|
||||
_vm._$g(127, "i")
|
||||
_vm._$g(132, "i")
|
||||
? _c(
|
||||
"uni-view",
|
||||
{
|
||||
staticClass: _vm._$g(127, "sc"),
|
||||
attrs: { _i: 127 },
|
||||
staticClass: _vm._$g(132, "sc"),
|
||||
attrs: { _i: 132 },
|
||||
},
|
||||
[
|
||||
_c("u-upload", {
|
||||
attrs: { _i: 128 },
|
||||
attrs: { _i: 133 },
|
||||
on: {
|
||||
afterRead: function ($event) {
|
||||
return _vm.$handleViewEvent($event)
|
||||
@@ -42267,11 +42298,11 @@ var render = function () {
|
||||
: _vm._e(),
|
||||
_c(
|
||||
"uni-view",
|
||||
{ staticClass: _vm._$g(129, "sc"), attrs: { _i: 129 } },
|
||||
{ staticClass: _vm._$g(134, "sc"), attrs: { _i: 134 } },
|
||||
[
|
||||
_c("i", {
|
||||
class: _vm._$g(130, "c"),
|
||||
attrs: { _i: 130 },
|
||||
class: _vm._$g(135, "c"),
|
||||
attrs: { _i: 135 },
|
||||
on: {
|
||||
click: function ($event) {
|
||||
return _vm.$handleViewEvent($event)
|
||||
@@ -42279,12 +42310,12 @@ var render = function () {
|
||||
},
|
||||
}),
|
||||
_c("v-uni-textarea", {
|
||||
staticClass: _vm._$g(131, "sc"),
|
||||
staticClass: _vm._$g(136, "sc"),
|
||||
attrs: {
|
||||
"placeholder-style":
|
||||
"font-size:24rpx;color:#aaaaaa;",
|
||||
placeholder: "请输入您要发送的内容",
|
||||
_i: 131,
|
||||
_i: 136,
|
||||
},
|
||||
on: {
|
||||
focus: function ($event) {
|
||||
@@ -42298,7 +42329,7 @@ var render = function () {
|
||||
},
|
||||
},
|
||||
model: {
|
||||
value: _vm._$g(131, "v-model"),
|
||||
value: _vm._$g(136, "v-model"),
|
||||
callback: function () {},
|
||||
expression: "Pform.comment",
|
||||
},
|
||||
@@ -42308,13 +42339,13 @@ var render = function () {
|
||||
),
|
||||
_c(
|
||||
"uni-view",
|
||||
{ attrs: { _i: 132 } },
|
||||
{ attrs: { _i: 137 } },
|
||||
[
|
||||
_vm._$g(133, "i")
|
||||
_vm._$g(138, "i")
|
||||
? _c(
|
||||
"u-button",
|
||||
{
|
||||
attrs: { _i: 133 },
|
||||
attrs: { _i: 138 },
|
||||
on: {
|
||||
click: function ($event) {
|
||||
return _vm.$handleViewEvent($event)
|
||||
@@ -42326,7 +42357,7 @@ var render = function () {
|
||||
: _c(
|
||||
"u-button",
|
||||
{
|
||||
attrs: { _i: 134 },
|
||||
attrs: { _i: 139 },
|
||||
on: {
|
||||
click: function ($event) {
|
||||
return _vm.$handleViewEvent($event)
|
||||
@@ -42345,12 +42376,12 @@ var render = function () {
|
||||
"uni-view",
|
||||
{
|
||||
staticStyle: { position: "relative" },
|
||||
attrs: { _i: 135 },
|
||||
attrs: { _i: 140 },
|
||||
},
|
||||
[
|
||||
_vm._$g(136, "i")
|
||||
_vm._$g(141, "i")
|
||||
? _c("emotion", {
|
||||
attrs: { _i: 136 },
|
||||
attrs: { _i: 141 },
|
||||
on: {
|
||||
emotion: function ($event) {
|
||||
return _vm.$handleViewEvent($event)
|
||||
@@ -42373,7 +42404,7 @@ var render = function () {
|
||||
_c(
|
||||
"u-popup",
|
||||
{
|
||||
attrs: { _i: 137 },
|
||||
attrs: { _i: 142 },
|
||||
on: {
|
||||
close: function ($event) {
|
||||
return _vm.$handleViewEvent($event)
|
||||
@@ -42384,26 +42415,26 @@ var render = function () {
|
||||
_c(
|
||||
"uni-view",
|
||||
{
|
||||
staticClass: _vm._$g(138, "sc"),
|
||||
staticClass: _vm._$g(143, "sc"),
|
||||
staticStyle: { height: "500rpx", "overflow-y": "scroll" },
|
||||
attrs: { _i: 138 },
|
||||
attrs: { _i: 143 },
|
||||
},
|
||||
[
|
||||
_c(
|
||||
"uni-view",
|
||||
{ staticClass: _vm._$g(139, "sc"), attrs: { _i: 139 } },
|
||||
{ staticClass: _vm._$g(144, "sc"), attrs: { _i: 144 } },
|
||||
[_vm._v("请选择要查看包裹")]
|
||||
),
|
||||
_c(
|
||||
"uni-view",
|
||||
{ staticClass: _vm._$g(140, "sc"), attrs: { _i: 140 } },
|
||||
_vm._l(_vm._$g(141, "f"), function (item, index, $21, $31) {
|
||||
{ staticClass: _vm._$g(145, "sc"), attrs: { _i: 145 } },
|
||||
_vm._l(_vm._$g(146, "f"), function (item, index, $21, $31) {
|
||||
return _c(
|
||||
"uni-view",
|
||||
{
|
||||
key: item,
|
||||
staticClass: _vm._$g("141-" + $31, "sc"),
|
||||
attrs: { _i: "141-" + $31 },
|
||||
staticClass: _vm._$g("146-" + $31, "sc"),
|
||||
attrs: { _i: "146-" + $31 },
|
||||
on: {
|
||||
click: function ($event) {
|
||||
return _vm.$handleViewEvent($event)
|
||||
@@ -42415,18 +42446,18 @@ var render = function () {
|
||||
"h4",
|
||||
{
|
||||
staticStyle: { "margin-bottom": "10rpx" },
|
||||
attrs: { _i: "142-" + $31 },
|
||||
attrs: { _i: "147-" + $31 },
|
||||
},
|
||||
[_vm._v("包裹 " + _vm._$g("142-" + $31, "t0-0"))]
|
||||
[_vm._v("包裹 " + _vm._$g("147-" + $31, "t0-0"))]
|
||||
),
|
||||
_c(
|
||||
"uni-view",
|
||||
{ attrs: { _i: "143-" + $31 } },
|
||||
{ attrs: { _i: "148-" + $31 } },
|
||||
[
|
||||
_vm._v("运单号：" + _vm._$g("143-" + $31, "t0-0")),
|
||||
_vm._v("运单号：" + _vm._$g("148-" + $31, "t0-0")),
|
||||
_c("u-tag", {
|
||||
staticClass: _vm._$g("144-" + $31, "sc"),
|
||||
attrs: { _i: "144-" + $31 },
|
||||
staticClass: _vm._$g("149-" + $31, "sc"),
|
||||
attrs: { _i: "149-" + $31 },
|
||||
on: {
|
||||
click: function ($event) {
|
||||
return _vm.$handleViewEvent($event)
|
||||
@@ -42436,8 +42467,8 @@ var render = function () {
|
||||
],
|
||||
1
|
||||
),
|
||||
_c("uni-view", { attrs: { _i: "145-" + $31 } }, [
|
||||
_vm._v("发货时间：" + _vm._$g("145-" + $31, "t0-0")),
|
||||
_c("uni-view", { attrs: { _i: "150-" + $31 } }, [
|
||||
_vm._v("发货时间：" + _vm._$g("150-" + $31, "t0-0")),
|
||||
]),
|
||||
],
|
||||
1
|
||||
@@ -42451,7 +42482,7 @@ var render = function () {
|
||||
],
|
||||
1
|
||||
),
|
||||
_c("music-play", { attrs: { _i: 146 } }),
|
||||
_c("music-play", { attrs: { _i: 151 } }),
|
||||
],
|
||||
1
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user