|
@@ -27,10 +27,10 @@
|
|
width="12px" height="13px"></u--image>
|
|
width="12px" height="13px"></u--image>
|
|
<view class='icon-text'>{{ cardInfo.phone }}</view>
|
|
<view class='icon-text'>{{ cardInfo.phone }}</view>
|
|
</view>
|
|
</view>
|
|
- <view @click='remarkEdit(cardInfo)' class="row2 flex" style="color: #808080">
|
|
|
|
|
|
+ <view class="row2 flex" style="color: #808080">
|
|
<u--image :showLoading="true" :src="'/static/imgs/card/remark'+cardInfo.icon+'.png'"
|
|
<u--image :showLoading="true" :src="'/static/imgs/card/remark'+cardInfo.icon+'.png'"
|
|
width="10px" height="12px"></u--image>
|
|
width="10px" height="12px"></u--image>
|
|
- <view class='icon-text' style="color: #808080;">{{cardInfo.remark?cardInfo.remark:'单击添加备注'}}
|
|
|
|
|
|
+ <view class='icon-text' style="color: #808080;">{{cardInfo.remark?cardInfo.remark:''}}
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
@@ -59,10 +59,10 @@
|
|
width="12px" height="13px"></u--image>
|
|
width="12px" height="13px"></u--image>
|
|
<view class='icon-text'>{{ cardInfo.phone }}</view>
|
|
<view class='icon-text'>{{ cardInfo.phone }}</view>
|
|
</view>
|
|
</view>
|
|
- <view @click='remarkEdit(cardInfo)' class="row2 flex" style="color: #808080">
|
|
|
|
|
|
+ <view class="row2 flex" style="color: #808080">
|
|
<u--image :showLoading="true" :src="'/static/imgs/card/remark'+cardInfo.icon+'.png'"
|
|
<u--image :showLoading="true" :src="'/static/imgs/card/remark'+cardInfo.icon+'.png'"
|
|
width="10px" height="12px"></u--image>
|
|
width="10px" height="12px"></u--image>
|
|
- <view class='icon-text' style="color: #808080;">{{cardInfo.remark?cardInfo.remark:'单击添加备注'}}
|
|
|
|
|
|
+ <view class='icon-text' style="color: #808080;">{{cardInfo.remark?cardInfo.remark:''}}
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
@@ -107,11 +107,11 @@
|
|
width="12px" height="13px"></u--image>
|
|
width="12px" height="13px"></u--image>
|
|
<view class='icon-text'>{{ cardInfo.phone }}</view>
|
|
<view class='icon-text'>{{ cardInfo.phone }}</view>
|
|
</view>
|
|
</view>
|
|
- <view @click='remarkEdit(cardInfo)' class="row2 flex" style="color: #808080">
|
|
|
|
|
|
+ <view class="row2 flex" style="color: #808080">
|
|
<u--image :showLoading="true" :src="'/static/imgs/card/remark'+cardInfo.icon+'.png'"
|
|
<u--image :showLoading="true" :src="'/static/imgs/card/remark'+cardInfo.icon+'.png'"
|
|
width="10px" height="12px"></u--image>
|
|
width="10px" height="12px"></u--image>
|
|
<view class='icon-text' style="color: #808080;">
|
|
<view class='icon-text' style="color: #808080;">
|
|
- {{cardInfo.remark?cardInfo.remark:'单击添加备注'}}
|
|
|
|
|
|
+ {{cardInfo.remark?cardInfo.remark:''}}
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
@@ -152,11 +152,11 @@
|
|
width="12px" height="13px"></u--image>
|
|
width="12px" height="13px"></u--image>
|
|
<view class='icon-text'>{{ cardInfo.phone }}</view>
|
|
<view class='icon-text'>{{ cardInfo.phone }}</view>
|
|
</view>
|
|
</view>
|
|
- <view @click='remarkEdit(cardInfo)' class="row2 flex" style="color: #808080">
|
|
|
|
|
|
+ <view class="row2 flex" style="color: #808080">
|
|
<u--image :showLoading="true" :src="'/static/imgs/card/remark'+cardInfo.icon+'.png'"
|
|
<u--image :showLoading="true" :src="'/static/imgs/card/remark'+cardInfo.icon+'.png'"
|
|
width="10px" height="12px"></u--image>
|
|
width="10px" height="12px"></u--image>
|
|
<view :style='cardInfo.remark?"color:#000;":"color:#808080;"' class='icon-text'>
|
|
<view :style='cardInfo.remark?"color:#000;":"color:#808080;"' class='icon-text'>
|
|
- {{cardInfo.remark?cardInfo.remark:'单击添加备注'}}
|
|
|
|
|
|
+ {{cardInfo.remark?cardInfo.remark:''}}
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
@@ -257,6 +257,7 @@
|
|
}
|
|
}
|
|
},
|
|
},
|
|
onLoad(options) {
|
|
onLoad(options) {
|
|
|
|
+ console.log(123)
|
|
this.id = options.id.indexOf(",") ? options.id.split(",")[0] : options.id
|
|
this.id = options.id.indexOf(",") ? options.id.split(",")[0] : options.id
|
|
this.commonId = options.id.indexOf(",") ? options.id.split(",")[1] : ''
|
|
this.commonId = options.id.indexOf(",") ? options.id.split(",")[1] : ''
|
|
this.getList()
|
|
this.getList()
|
|
@@ -292,6 +293,7 @@
|
|
title: '保存成功!',
|
|
title: '保存成功!',
|
|
duration: 2000
|
|
duration: 2000
|
|
});
|
|
});
|
|
|
|
+ uni.setStorageSync("scanAddCardToIndex",1)
|
|
uni.switchTab({
|
|
uni.switchTab({
|
|
url: "/pages/cardHolder/cardHolder"
|
|
url: "/pages/cardHolder/cardHolder"
|
|
|
|
|
|
@@ -330,7 +332,7 @@
|
|
}).then(res => {
|
|
}).then(res => {
|
|
console.log(res, "this.cardInfo")
|
|
console.log(res, "this.cardInfo")
|
|
this.cardInfo = res.data
|
|
this.cardInfo = res.data
|
|
- this.cardInfo.cardBusiness = ''
|
|
|
|
|
|
+ // this.cardInfo.cardBusiness = ''
|
|
// this.cardInfo.cardCommonId = res.data.commonId
|
|
// this.cardInfo.cardCommonId = res.data.commonId
|
|
console.log(res)
|
|
console.log(res)
|
|
})
|
|
})
|
|
@@ -345,7 +347,10 @@
|
|
});
|
|
});
|
|
uni.hideLoading()
|
|
uni.hideLoading()
|
|
}).then(res => {
|
|
}).then(res => {
|
|
- this.cardList = [res.data.cardInfos]
|
|
|
|
|
|
+ this.cardList = [res.data.items]
|
|
|
|
+ this.cardInfo.cardBusiness = res.data.items[0].cardBusiness
|
|
|
|
+ this.cardInfo.myCardId = res.data.items[0].id
|
|
|
|
+
|
|
})
|
|
})
|
|
this.$request.baseRequest('admin.unimall.cardClassifyInfo', 'list', {
|
|
this.$request.baseRequest('admin.unimall.cardClassifyInfo', 'list', {
|
|
page: 1,
|
|
page: 1,
|