|
|
@@ -10,7 +10,7 @@
|
|
|
<div
|
|
|
style="width:148px;height:148px;background-color: #fbfdff; border: 1px dashed #c0ccda;border-radius: 6px;text-align: center;line-height: 148px;">
|
|
|
<el-upload class="avatar-uploader" v-model="logo"
|
|
|
-action="https://tcwmpcshop.xianmaxiong.com/sqx_fast/alioss/upload"
|
|
|
+action="https://www.daweilinli.com/sqx_fast/alioss/upload"
|
|
|
:show-file-list="false" :on-success="handleAvatarSuccess">
|
|
|
<img v-if="logo" :src="logo" class="avatar"
|
|
|
style="width: 148px;height: 148px;border-radius:6px;" />
|
|
|
@@ -35,7 +35,7 @@ action="https://tcwmpcshop.xianmaxiong.com/sqx_fast/alioss/upload"
|
|
|
</div>
|
|
|
</div>
|
|
|
<el-upload ref='upload'
|
|
|
-action="https://tcwmpcshop.xianmaxiong.com/sqx_fast/alioss/upload"
|
|
|
+action="https://www.daweilinli.com/sqx_fast/alioss/upload"
|
|
|
list-type="picture-card" :on-success="handleUploadSuccess"
|
|
|
:on-change="handleChange" :on-remove="handleRemove">
|
|
|
<i class="el-icon-plus"></i>
|
|
|
@@ -197,7 +197,7 @@ action="https://tcwmpcshop.xianmaxiong.com/sqx_fast/alioss/upload"
|
|
|
<el-button v-if="isbtn" style="margin-bottom: 20px;" size="mini" type="primary" @click="updates">修改
|
|
|
</el-button>
|
|
|
</div>
|
|
|
-
|
|
|
+
|
|
|
<div v-if="!isbtn" style="display: inline-block;">
|
|
|
<el-button style="margin-bottom: 20px;" size="mini" type="primary" @click="cancel">取消
|
|
|
</el-button>
|
|
|
@@ -208,13 +208,15 @@ action="https://tcwmpcshop.xianmaxiong.com/sqx_fast/alioss/upload"
|
|
|
</div>
|
|
|
</el-tab-pane>
|
|
|
<el-tab-pane label="店铺收入" name="second">
|
|
|
- <el-select v-model="way" style="width:150px;margin-left: 10px;" @change="animeDat">
|
|
|
+ <el-select v-model="way" style="width:150px;margin-left: 10px;">
|
|
|
<el-option v-for="item in ways" :key="item.value" :label="item.label" :value="item.value">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
<el-date-picker style="width: 160px;margin-left: 10px;" v-model="info.stockDate" align="right"
|
|
|
type="datetime" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择开始时间" @change="timeDate">
|
|
|
</el-date-picker>
|
|
|
+ <el-button style="margin-bottom: 20px;" size="mini" type="primary" @click="timeDate()">查询
|
|
|
+ </el-button>
|
|
|
</div>
|
|
|
<el-row v-loading="tableDataLoading1">
|
|
|
<el-col :span="6" class="cards">
|
|
|
@@ -390,7 +392,7 @@ action="https://tcwmpcshop.xianmaxiong.com/sqx_fast/alioss/upload"
|
|
|
<div
|
|
|
style=" width:148px;height:148px;background-color: #fbfdff; border: 1px dashed #c0ccda;border-radius: 6px;text-align: center;line-height: 148px;display: inline-block;">
|
|
|
<el-upload class="avatar-uploader" v-model="tixianData.cashQrCode"
|
|
|
- action="https://tcwmpcshop.xianmaxiong.com/sqx_fast/alioss/upload" :show-file-list="false"
|
|
|
+ action="https://www.daweilinli.com/sqx_fast/alioss/upload" :show-file-list="false"
|
|
|
:on-success="handleAvatarSuccess1">
|
|
|
<img v-if="tixianData.cashQrCode" :src="tixianData.cashQrCode" class="avatar"
|
|
|
style="width: 148px;height: 148px;" />
|
|
|
@@ -398,7 +400,7 @@ action="https://tcwmpcshop.xianmaxiong.com/sqx_fast/alioss/upload"
|
|
|
</el-upload>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div style="margin:10px 0;">
|
|
|
+ <!-- <div style="margin:10px 0;">
|
|
|
<span>开户行:</span>
|
|
|
<el-input style="width: 200px;" @keydown.enter.native="select" clearable placeholder="请输入开户行"
|
|
|
v-model="tixianData.bankOfDeposit">
|
|
|
@@ -421,7 +423,7 @@ action="https://tcwmpcshop.xianmaxiong.com/sqx_fast/alioss/upload"
|
|
|
<el-input style="width: 200px;" @keydown.enter.native="select" clearable placeholder="请输入银行卡绑定手机号"
|
|
|
v-model="tixianData.bankPhone">
|
|
|
</el-input>
|
|
|
- </div>
|
|
|
+ </div> -->
|
|
|
<el-button style="margin:50px;" type="primary" icon="document" @click="querenBtn">确认
|
|
|
</el-button>
|
|
|
</el-tab-pane>
|
|
|
@@ -489,7 +491,7 @@ action="https://tcwmpcshop.xianmaxiong.com/sqx_fast/alioss/upload"
|
|
|
<el-radio-group v-model="txtype">
|
|
|
<el-radio :label="1">支付宝</el-radio>
|
|
|
<el-radio :label="2">微信</el-radio>
|
|
|
- <el-radio :label="5">银行卡</el-radio>
|
|
|
+ <!-- <el-radio :label="5">银行卡</el-radio> -->
|
|
|
</el-radio-group>
|
|
|
</div>
|
|
|
<el-form :model="tixianData">
|
|
|
@@ -560,15 +562,15 @@ action="https://tcwmpcshop.xianmaxiong.com/sqx_fast/alioss/upload"
|
|
|
info: {
|
|
|
stockDate: this.getNowTime(), //日期
|
|
|
},
|
|
|
- way: 3,
|
|
|
+ way: 'day',
|
|
|
ways: [{
|
|
|
- value: 3,
|
|
|
+ value: 'day',
|
|
|
label: '按天查询'
|
|
|
}, {
|
|
|
- value: 2,
|
|
|
+ value: 'month',
|
|
|
label: '按月查询'
|
|
|
}, {
|
|
|
- value: 1,
|
|
|
+ value: 'year',
|
|
|
label: '按年查询'
|
|
|
}],
|
|
|
typeId: '',
|
|
|
@@ -601,7 +603,7 @@ action="https://tcwmpcshop.xianmaxiong.com/sqx_fast/alioss/upload"
|
|
|
businessHours: '',
|
|
|
lockHours: '',
|
|
|
detailedAddress: '',
|
|
|
- shopNotice: '',
|
|
|
+ shopNotice: '店铺开业啦!',
|
|
|
latitude: '',
|
|
|
longitude: '',
|
|
|
shopCover: '',
|
|
|
@@ -687,20 +689,20 @@ action="https://tcwmpcshop.xianmaxiong.com/sqx_fast/alioss/upload"
|
|
|
let vanumber = value
|
|
|
if (vanumber === 3) {
|
|
|
this.moneySelect()
|
|
|
- this.orderSelect()
|
|
|
+ // this.orderSelect()
|
|
|
}
|
|
|
if (vanumber === 2) {
|
|
|
this.moneySelect()
|
|
|
- this.orderSelect()
|
|
|
+ // this.orderSelect()
|
|
|
}
|
|
|
if (vanumber === 1) {
|
|
|
this.moneySelect()
|
|
|
- this.orderSelect()
|
|
|
+ // this.orderSelect()
|
|
|
}
|
|
|
},
|
|
|
timeDate() {
|
|
|
this.moneySelect()
|
|
|
- this.orderSelect()
|
|
|
+ // this.orderSelect()
|
|
|
},
|
|
|
// 商品评价跳转
|
|
|
discuss(index, rows) {
|
|
|
@@ -749,7 +751,7 @@ action="https://tcwmpcshop.xianmaxiong.com/sqx_fast/alioss/upload"
|
|
|
// 'startTime': this.startTime,
|
|
|
// 'endTime': this.endTime
|
|
|
'date': this.info.stockDate,
|
|
|
- 'dateType': this.flag
|
|
|
+ 'dateType': this.way
|
|
|
})
|
|
|
}).then(({
|
|
|
data
|
|
|
@@ -781,7 +783,12 @@ action="https://tcwmpcshop.xianmaxiong.com/sqx_fast/alioss/upload"
|
|
|
this.businessHours = returnData.businessHours
|
|
|
this.lockHours = returnData.lockHours
|
|
|
this.detailedAddress = returnData.detailedAddress
|
|
|
- this.shopNotice = returnData.shopNotice
|
|
|
+ if(returnData.shopNotice){
|
|
|
+ this.shopNotice = returnData.shopNotice
|
|
|
+ }else{
|
|
|
+ this.shopNotice = '店铺开业啦!'
|
|
|
+ }
|
|
|
+
|
|
|
this.latitude = returnData.latitude
|
|
|
this.longitude = returnData.longitude
|
|
|
this.exemptMinMoney = returnData.exemptMinMoney
|
|
|
@@ -1105,10 +1112,10 @@ action="https://tcwmpcshop.xianmaxiong.com/sqx_fast/alioss/upload"
|
|
|
'zhiFuBaoName': this.tixianData.zhiFuBaoName,
|
|
|
'shopId': this.shopId,
|
|
|
'cashQrCode': this.tixianData.cashQrCode,
|
|
|
- 'bankCardNumber': this.tixianData.bankCardNumber,
|
|
|
- 'bankOfDeposit': this.tixianData.bankOfDeposit,
|
|
|
- 'bankRealName': this.tixianData.bankRealName,
|
|
|
- 'bankPhone': this.tixianData.bankPhone,
|
|
|
+ // 'bankCardNumber': this.tixianData.bankCardNumber,
|
|
|
+ // 'bankOfDeposit': this.tixianData.bankOfDeposit,
|
|
|
+ // 'bankRealName': this.tixianData.bankRealName,
|
|
|
+ // 'bankPhone': this.tixianData.bankPhone,
|
|
|
})
|
|
|
}).then(({
|
|
|
data
|
|
|
@@ -1219,7 +1226,7 @@ action="https://tcwmpcshop.xianmaxiong.com/sqx_fast/alioss/upload"
|
|
|
// this.shopId = this.$cookie.get('shopId')
|
|
|
this.indexEr = index
|
|
|
if(index==1){
|
|
|
-this.shopQrImg = 'https://tcwmpcshop.xianmaxiong.com/sqx_fast/invite/shopQr?shopId=' + this.shopI
|
|
|
+this.shopQrImg = 'https://www.daweilinli.com/sqx_fast/invite/shopQr?shopId=' + this.shopI
|
|
|
}else{
|
|
|
this.$http({
|
|
|
url: this.$http.adornUrl('app/common/type/334'),
|
|
|
@@ -1230,10 +1237,10 @@ this.shopQrImg = 'https://tcwmpcshop.xianmaxiong.com/sqx_fast/invite/shopQr?shop
|
|
|
}) => {
|
|
|
this.shopQrImg = data.data.value
|
|
|
})
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
this.dialogFormVisible2 = true
|
|
|
-
|
|
|
+
|
|
|
|
|
|
},
|
|
|
chakan() {
|