Commit 62535a6e by member

第三方小程序增加一个网址

parent 7e6a40b8
...@@ -159,7 +159,7 @@ components: {linkId ...@@ -159,7 +159,7 @@ components: {linkId
</el-select> </el-select>
</td> </td>
<td> <td>
<el-input size="small" class="h5-el-input" v-model="dynamicRow.value" type="text" clearable @keyup.native="(value) => dynamicBlur(value)" placeholder="请输入参数"></el-input> <el-input size="small" class="h5-el-input" v-model="dynamicRow.value" clearable type="text" @keyup.native="(value) => dynamicBlur(value)" placeholder="请输入参数"></el-input>
</td> </td>
<td><el-button type="text" @click.stop="addDynamic()">添加</el-button></td> <td><el-button type="text" @click.stop="addDynamic()">添加</el-button></td>
</tr> </tr>
...@@ -209,7 +209,7 @@ components: {linkId ...@@ -209,7 +209,7 @@ components: {linkId
<el-radio v-model="h5linkObj.shareWebType" label="0">当前页</el-radio> <el-radio v-model="h5linkObj.shareWebType" label="0">当前页</el-radio>
</div> </div>
<div class="h5link-row" v-if="h5linkObj.share"> <div class="h5link-row" v-if="h5linkObj.share">
<label class="h5link-title" > </label> <label class="h5link-title"> </label>
<el-radio class="p-l-7" v-model="h5linkObj.shareWebType" label="1">其他链接网址</el-radio><el-input class="p-l-47" v-model="h5linkObj.shareUrl" placeholder="请输入网址"></el-input> <el-radio class="p-l-7" v-model="h5linkObj.shareWebType" label="1">其他链接网址</el-radio><el-input class="p-l-47" v-model="h5linkObj.shareUrl" placeholder="请输入网址"></el-input>
</div> </div>
</div> </div>
...@@ -220,10 +220,12 @@ components: {linkId ...@@ -220,10 +220,12 @@ components: {linkId
<label class="h5link-title">名称</label> <label class="h5link-title">名称</label>
<el-input v-model="thirdObj.name" placeholder="请输入名称"></el-input> <el-input v-model="thirdObj.name" placeholder="请输入名称"></el-input>
</div> </div>
-->
<div class="h5link-row"> <div class="h5link-row">
<label class="h5link-title">appid</label> <label class="h5link-title">网址</label>
<el-input v-model="thirdObj.appid" placeholder="请输入 appid"></el-input> <el-input v-model="thirdObj.pagePath" placeholder="请输入网址"></el-input>
</div> --> </div>
<!--
<div class="h5link-row"> <div class="h5link-row">
<label class="h5link-title h5link-dynamic-title">动态参数(选填)</label> <label class="h5link-title h5link-dynamic-title">动态参数(选填)</label>
<div class="h5-table"> <div class="h5-table">
...@@ -261,7 +263,7 @@ components: {linkId ...@@ -261,7 +263,7 @@ components: {linkId
</el-select> </el-select>
</td> </td>
<td> <td>
<el-input size="small" class="h5-el-input" v-model="dynamicRow.value" type="text" clearable @keyup.native="(value) => dynamicBlur(value)" placeholder="请输入参数"></el-input> <el-input size="small" class="h5-el-input" v-model="dynamicRow.value" clearable type="text" @keyup.native="(value) => dynamicBlur(value)" placeholder="请输入参数"></el-input>
</td> </td>
<td><el-button type="text" @click.stop="addDynamic()">添加</el-button></td> <td><el-button type="text" @click.stop="addDynamic()">添加</el-button></td>
</tr> </tr>
...@@ -301,7 +303,9 @@ components: {linkId ...@@ -301,7 +303,9 @@ components: {linkId
</tbody> </tbody>
</table> </table>
</div> </div>
</div> </div> -->
</div> </div>
...@@ -552,6 +556,7 @@ export default { ...@@ -552,6 +556,7 @@ export default {
thirdlinkVisible: false, thirdlinkVisible: false,
thirdObj:{ thirdObj:{
name: '', name: '',
pagePath: '',
appid: '', appid: '',
}, },
...@@ -640,7 +645,8 @@ export default { ...@@ -640,7 +645,8 @@ export default {
name: '', name: '',
url: '', url: '',
params: '', params: '',
share: 0 share: 0,
pagePath: ''
}, },
// 获取 location origin // 获取 location origin
baseUrl: '', baseUrl: '',
...@@ -697,9 +703,11 @@ export default { ...@@ -697,9 +703,11 @@ export default {
editAble: false editAble: false
} }
that.dynamicList = []; that.dynamicList = [];
that. thirdObj = {
this.thirdObj = {
name: '', name: '',
appid: '', appid: '',
pagePath: ''
}; };
that.selectLinkObj.name = ''; that.selectLinkObj.name = '';
that.selectLinkObj.url = ''; that.selectLinkObj.url = '';
...@@ -1475,14 +1483,23 @@ export default { ...@@ -1475,14 +1483,23 @@ export default {
message: "请选择第三方小程序" message: "请选择第三方小程序"
}) })
} }
const reg = /^(http|https|www)(:\/\/)?.[A-Za-z]+.[A-Za-z]+.*/;
if (!reg.test(this.thirdObj.pagePath)) {
this.$message.error({
duration: 1000,
message: "输入的网址不合法!"
})
return;
}
this.twoLevelOptions.forEach(v => { this.twoLevelOptions.forEach(v => {
if (v.value === this.twoLevelValue) { if (v.value === this.twoLevelValue) {
that.selectLinkObj.name = v.label; that.selectLinkObj.name = v.label;
that.selectLinkObj.appid = v.value;// that.selectLinkObj.appid = v.value;
// that.selectLinkObj.id = selectOneItem.linkId; // that.selectLinkObj.id = selectOneItem.linkId;
// that.selectLinkObj.id = v.id; // that.selectLinkObj.id = v.id;
} }
}) })
this.selectLinkObj.pagePath = this.thirdObj.pagePath;
that.selectLinkObj.params = '' that.selectLinkObj.params = ''
if (!!that.dynamicList.length) { if (!!that.dynamicList.length) {
let thirdDataList = JSON.parse(JSON.stringify(that.dynamicList)) let thirdDataList = JSON.parse(JSON.stringify(that.dynamicList))
...@@ -1494,10 +1511,9 @@ export default { ...@@ -1494,10 +1511,9 @@ export default {
that.selectLinkObj.params = thirdDataList that.selectLinkObj.params = thirdDataList
} }
console.log(that.selectLinkObj) console.log(this.selectLinkObj);
// 触发父组件方法,传递参数 // 触发父组件方法,传递参数
that.transData(); that.transData();
return; return;
} }
...@@ -1607,6 +1623,7 @@ export default { ...@@ -1607,6 +1623,7 @@ export default {
resetAll() { resetAll() {
var that = this var that = this
this.cardLinksVisible = false; this.cardLinksVisible = false;
this.visibleType = null;
that.h5linkVisible = false; that.h5linkVisible = false;
that.thirdlinkVisible = false; // 第三方小程序 that.thirdlinkVisible = false; // 第三方小程序
that.linksType = ''; that.linksType = '';
...@@ -1628,14 +1645,16 @@ export default { ...@@ -1628,14 +1645,16 @@ export default {
that.dynamicList = []; that.dynamicList = [];
// 第三方小程序 // 第三方小程序
that.thirdObj = { this.thirdObj = {
name: '', name: '',
pagePath: '',
appid: '' appid: ''
} }
that.selectLinkObj = { that.selectLinkObj = {
url: '', url: '',
name: '' name: '',
pagePath: ''
} }
that.currentPage = 1; that.currentPage = 1;
that.total = 0; that.total = 0;
...@@ -1847,6 +1866,8 @@ export default { ...@@ -1847,6 +1866,8 @@ export default {
// 添加对象到数组中 // 添加对象到数组中
// that.dynamicList.push(that.dynamicRow) // that.dynamicList.push(that.dynamicRow)
// 删除一下
this.dynamicRow.value = ''; this.dynamicRow.value = '';
this.dynamicRow.key = null; this.dynamicRow.key = null;
}, },
......
<template> <template>
<!-- 链接小工具 --> <!-- 链接小工具 -->
<div class="link-tools-contain"> <div class="link-tools-contain">
...@@ -118,7 +119,7 @@ ...@@ -118,7 +119,7 @@
<tbody> <tbody>
<tr> <tr>
<td> <td>
<el-select size="small" class="dynamic-param-select" v-model="dynamicRow.key" placeholder="请选择参数" @change="dynamicChange($event)"> <el-select size="small" class="dynamic-param-select" v-model="dynamicRow.key" clearable placeholder="请选择参数" @change="dynamicChange($event)">
<el-option <el-option
v-for="item in h5linkObj.dynamicParaOptions" v-for="item in h5linkObj.dynamicParaOptions"
:key="item.value" :key="item.value"
...@@ -128,7 +129,7 @@ ...@@ -128,7 +129,7 @@
</el-select> </el-select>
</td> </td>
<td> <td>
<el-input size="small" class="h5-el-input" v-model="dynamicRow.value" type="text" @keyup.native="(value) => dynamicBlur(value)" placeholder="请输入参数"></el-input> <el-input size="small" class="h5-el-input" v-model="dynamicRow.value" clearable type="text" @keyup.native="(value) => dynamicBlur(value)" placeholder="请输入参数"></el-input>
</td> </td>
<td><el-button type="text" @click.stop="addDynamic()">添加</el-button></td> <td><el-button type="text" @click.stop="addDynamic()">添加</el-button></td>
</tr> </tr>
...@@ -137,7 +138,7 @@ ...@@ -137,7 +138,7 @@
<td> <td>
<template v-if="!dynamicItem.editAble">{{dynamicItem.key}}</template> <template v-if="!dynamicItem.editAble">{{dynamicItem.key}}</template>
<template v-if="dynamicItem.editAble"> <template v-if="dynamicItem.editAble">
<el-select size="small" class="dynamic-param-select" clearable v-model="dynamicItem.selectKey" placeholder="请选择参数"> <el-select size="small" class="dynamic-param-select" v-model="dynamicItem.selectKey" placeholder="请选择参数">
<el-option <el-option
v-for="item in h5linkObj.dynamicParaOptions" v-for="item in h5linkObj.dynamicParaOptions"
:key="item.value" :key="item.value"
...@@ -150,7 +151,7 @@ ...@@ -150,7 +151,7 @@
<td> <td>
<template v-if="!dynamicItem.editAble">{{dynamicItem.value}}</template> <template v-if="!dynamicItem.editAble">{{dynamicItem.value}}</template>
<template v-if="dynamicItem.editAble"> <template v-if="dynamicItem.editAble">
<el-input size="small" class="h5-el-input" v-model="dynamicItem.inputValue" clearable type="text" placeholder="请输入参数"></el-input> <el-input size="small" class="h5-el-input" v-model="dynamicItem.inputValue" type="text" placeholder="请输入参数"></el-input>
</template> </template>
</td> </td>
<td> <td>
...@@ -189,10 +190,12 @@ ...@@ -189,10 +190,12 @@
<label class="h5link-title">名称</label> <label class="h5link-title">名称</label>
<el-input v-model="thirdObj.name" placeholder="请输入名称"></el-input> <el-input v-model="thirdObj.name" placeholder="请输入名称"></el-input>
</div> </div>
-->
<div class="h5link-row"> <div class="h5link-row">
<label class="h5link-title">appid</label> <label class="h5link-title">网址</label>
<el-input v-model="thirdObj.appid" placeholder="请输入 appid"></el-input> <el-input v-model="thirdObj.pagePath" placeholder="请输入网址"></el-input>
</div> --> </div>
<!--
<div class="h5link-row"> <div class="h5link-row">
<label class="h5link-title h5link-dynamic-title">动态参数(选填)</label> <label class="h5link-title h5link-dynamic-title">动态参数(选填)</label>
<div class="h5-table"> <div class="h5-table">
...@@ -220,7 +223,7 @@ ...@@ -220,7 +223,7 @@
<tbody> <tbody>
<tr> <tr>
<td> <td>
<el-select size="small" class="dynamic-param-select" v-model="dynamicRow.key" placeholder="请选择参数" @change="dynamicChange($event)"> <el-select size="small" class="dynamic-param-select" v-model="dynamicRow.key" clearable placeholder="请选择参数" @change="dynamicChange($event)">
<el-option <el-option
v-for="item in h5linkObj.dynamicParaOptions" v-for="item in h5linkObj.dynamicParaOptions"
:key="item.value" :key="item.value"
...@@ -230,7 +233,7 @@ ...@@ -230,7 +233,7 @@
</el-select> </el-select>
</td> </td>
<td> <td>
<el-input size="small" class="h5-el-input" v-model="dynamicRow.value" type="text" @keyup.native="(value) => dynamicBlur(value)" placeholder="请输入参数"></el-input> <el-input size="small" class="h5-el-input" v-model="dynamicRow.value" clearable type="text" @keyup.native="(value) => dynamicBlur(value)" placeholder="请输入参数"></el-input>
</td> </td>
<td><el-button type="text" @click.stop="addDynamic()">添加</el-button></td> <td><el-button type="text" @click.stop="addDynamic()">添加</el-button></td>
</tr> </tr>
...@@ -239,7 +242,7 @@ ...@@ -239,7 +242,7 @@
<td> <td>
<template v-if="!dynamicItem.editAble">{{dynamicItem.key}}</template> <template v-if="!dynamicItem.editAble">{{dynamicItem.key}}</template>
<template v-if="dynamicItem.editAble"> <template v-if="dynamicItem.editAble">
<el-select size="small" class="dynamic-param-select" v-model="dynamicItem.selectKey" clearable placeholder="请选择参数"> <el-select size="small" class="dynamic-param-select" v-model="dynamicItem.selectKey" placeholder="请选择参数">
<el-option <el-option
v-for="item in h5linkObj.dynamicParaOptions" v-for="item in h5linkObj.dynamicParaOptions"
:key="item.value" :key="item.value"
...@@ -252,7 +255,7 @@ ...@@ -252,7 +255,7 @@
<td> <td>
<template v-if="!dynamicItem.editAble">{{dynamicItem.value}}</template> <template v-if="!dynamicItem.editAble">{{dynamicItem.value}}</template>
<template v-if="dynamicItem.editAble"> <template v-if="dynamicItem.editAble">
<el-input size="small" class="h5-el-input" v-model="dynamicItem.inputValue" clearable type="text" placeholder="请输入参数"></el-input> <el-input size="small" class="h5-el-input" v-model="dynamicItem.inputValue" type="text" placeholder="请输入参数"></el-input>
</template> </template>
</td> </td>
<td> <td>
...@@ -270,7 +273,9 @@ ...@@ -270,7 +273,9 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</div> </div> -->
</div> </div>
...@@ -521,6 +526,7 @@ export default { ...@@ -521,6 +526,7 @@ export default {
thirdlinkVisible: false, thirdlinkVisible: false,
thirdObj:{ thirdObj:{
name: '', name: '',
pagePath: '',
appid: '', appid: '',
}, },
...@@ -609,7 +615,8 @@ export default { ...@@ -609,7 +615,8 @@ export default {
name: '', name: '',
url: '', url: '',
params: '', params: '',
share: 0 share: 0,
pagePath: ''
}, },
// 获取 location origin // 获取 location origin
baseUrl: '', baseUrl: '',
...@@ -666,9 +673,11 @@ export default { ...@@ -666,9 +673,11 @@ export default {
editAble: false editAble: false
} }
that.dynamicList = []; that.dynamicList = [];
that. thirdObj = {
this.thirdObj = {
name: '', name: '',
appid: '', appid: '',
pagePath: ''
}; };
that.selectLinkObj.name = ''; that.selectLinkObj.name = '';
that.selectLinkObj.url = ''; that.selectLinkObj.url = '';
...@@ -685,8 +694,8 @@ export default { ...@@ -685,8 +694,8 @@ export default {
// set onelevel visible // set onelevel visible
setOneLevelVisible(type,selectOneItem) { setOneLevelVisible(type,selectOneItem) {
var that = this; var that = this;
this.cardLinksVisible = false;
this.visibleType = null; this.visibleType = null;
this.cardLinksVisible = false;
// 设置选择的 id // 设置选择的 id
that.selectLinkObj.id = selectOneItem.linkId; that.selectLinkObj.id = selectOneItem.linkId;
if (type) { if (type) {
...@@ -740,8 +749,8 @@ export default { ...@@ -740,8 +749,8 @@ export default {
// twoLevelValueChange (二级选择,保存选择类型) // twoLevelValueChange (二级选择,保存选择类型)
twoLevelValueChange(e) { twoLevelValueChange(e) {
var that = this var that = this
// 清空已经选择
this.visibleType = null; this.visibleType = null;
// 清空已经选择
that.selectLinkObj.name = ''; that.selectLinkObj.name = '';
that.selectLinkObj.url = ''; that.selectLinkObj.url = '';
this.cardLinksVisible = false; this.cardLinksVisible = false;
...@@ -1444,14 +1453,23 @@ export default { ...@@ -1444,14 +1453,23 @@ export default {
message: "请选择第三方小程序" message: "请选择第三方小程序"
}) })
} }
const reg = /^(http|https|www)(:\/\/)?.[A-Za-z]+.[A-Za-z]+.*/;
if (!reg.test(this.thirdObj.pagePath)) {
this.$message.error({
duration: 1000,
message: "输入的网址不合法!"
})
return;
}
this.twoLevelOptions.forEach(v => { this.twoLevelOptions.forEach(v => {
if (v.value === this.twoLevelValue) { if (v.value === this.twoLevelValue) {
that.selectLinkObj.name = v.label; that.selectLinkObj.name = v.label;
that.selectLinkObj.appid = v.value;// that.selectLinkObj.appid = v.value;
// that.selectLinkObj.id = selectOneItem.linkId; // that.selectLinkObj.id = selectOneItem.linkId;
// that.selectLinkObj.id = v.id; // that.selectLinkObj.id = v.id;
} }
}) })
this.selectLinkObj.pagePath = this.thirdObj.pagePath;
that.selectLinkObj.params = '' that.selectLinkObj.params = ''
if (!!that.dynamicList.length) { if (!!that.dynamicList.length) {
let thirdDataList = JSON.parse(JSON.stringify(that.dynamicList)) let thirdDataList = JSON.parse(JSON.stringify(that.dynamicList))
...@@ -1463,10 +1481,9 @@ export default { ...@@ -1463,10 +1481,9 @@ export default {
that.selectLinkObj.params = thirdDataList that.selectLinkObj.params = thirdDataList
} }
console.log(that.selectLinkObj) console.log(this.selectLinkObj);
// 触发父组件方法,传递参数 // 触发父组件方法,传递参数
that.transData(); that.transData();
return; return;
} }
...@@ -1576,6 +1593,7 @@ export default { ...@@ -1576,6 +1593,7 @@ export default {
resetAll() { resetAll() {
var that = this var that = this
this.cardLinksVisible = false; this.cardLinksVisible = false;
this.visibleType = null;
that.h5linkVisible = false; that.h5linkVisible = false;
that.thirdlinkVisible = false; // 第三方小程序 that.thirdlinkVisible = false; // 第三方小程序
that.linksType = ''; that.linksType = '';
...@@ -1597,14 +1615,16 @@ export default { ...@@ -1597,14 +1615,16 @@ export default {
that.dynamicList = []; that.dynamicList = [];
// 第三方小程序 // 第三方小程序
that.thirdObj = { this.thirdObj = {
name: '', name: '',
pagePath: '',
appid: '' appid: ''
} }
that.selectLinkObj = { that.selectLinkObj = {
url: '', url: '',
name: '' name: '',
pagePath: ''
} }
that.currentPage = 1; that.currentPage = 1;
that.total = 0; that.total = 0;
...@@ -1816,6 +1836,8 @@ export default { ...@@ -1816,6 +1836,8 @@ export default {
// 添加对象到数组中 // 添加对象到数组中
// that.dynamicList.push(that.dynamicRow) // that.dynamicList.push(that.dynamicRow)
// 删除一下
this.dynamicRow.value = ''; this.dynamicRow.value = '';
this.dynamicRow.key = null; this.dynamicRow.key = null;
}, },
......
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