|
|
@@ -17,7 +17,8 @@
|
|
|
<view class="right">
|
|
|
<image style='width:32rpx;height:32rpx;' v-if="searchVal" @click.native.stop="delSearchVal"
|
|
|
src="../../static/imgs/card/searchdel.png" mode="widthFix"></image>
|
|
|
- <uni-icons type="mic" size="24" @click.native.stop="micOpen" color="#9199af" style="margin-left: 20rpx;"></uni-icons>
|
|
|
+ <uni-icons type="mic" size="24" @click.native.stop="micOpen" color="#9199af"
|
|
|
+ style="margin-left: 20rpx;"></uni-icons>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="col flex">
|
|
|
@@ -57,18 +58,18 @@
|
|
|
{{item.companyName}}
|
|
|
</view>
|
|
|
<view class="row3 flex" @click="toMap(item)">
|
|
|
- <u--image :showLoading="true" :src="'/static/imgs/card/address'+item.icon+'.png'" width="13px"
|
|
|
- height="16px"></u--image>
|
|
|
+ <u--image :showLoading="true" :src="'/static/imgs/card/address'+item.icon+'.png'"
|
|
|
+ width="13px" height="16px"></u--image>
|
|
|
<view class='icon-text'>{{ item.province }}{{ item.city }}{{ item.area }}</view>
|
|
|
</view>
|
|
|
<view @click="freeTell(item)" class="row4 flex">
|
|
|
- <u--image :showLoading="true" :src="'/static/imgs/card/phone'+item.icon+'.png'" width="12px"
|
|
|
- height="13px"></u--image>
|
|
|
+ <u--image :showLoading="true" :src="'/static/imgs/card/phone'+item.icon+'.png'"
|
|
|
+ width="12px" height="13px"></u--image>
|
|
|
<view class='icon-text'>{{ item.phone }}</view>
|
|
|
</view>
|
|
|
<view @click='remarkEdit(item)' class="row2 flex" style="color: #808080">
|
|
|
- <u--image :showLoading="true" :src="'/static/imgs/card/remark'+item.icon+'.png'" width="10px"
|
|
|
- height="12px"></u--image>
|
|
|
+ <u--image :showLoading="true" :src="'/static/imgs/card/remark'+item.icon+'.png'"
|
|
|
+ width="10px" height="12px"></u--image>
|
|
|
<view class='icon-text' style="color: #808080;">{{item.remark?item.remark:'单击添加备注'}}
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -90,18 +91,18 @@
|
|
|
{{item.companyName}}
|
|
|
</view>
|
|
|
<view @click="toMap(item)" class="row3 flex">
|
|
|
- <u--image :showLoading="true" :src="'/static/imgs/card/address'+item.icon+'.png'" width="13px"
|
|
|
- height="16px"></u--image>
|
|
|
+ <u--image :showLoading="true" :src="'/static/imgs/card/address'+item.icon+'.png'"
|
|
|
+ width="13px" height="16px"></u--image>
|
|
|
<view class='icon-text'>{{ item.province }}{{ item.city }}{{ item.area }}</view>
|
|
|
</view>
|
|
|
<view @click="freeTell(item)" class="row4 flex">
|
|
|
- <u--image :showLoading="true" :src="'/static/imgs/card/phone'+item.icon+'.png'" width="12px"
|
|
|
- height="13px"></u--image>
|
|
|
+ <u--image :showLoading="true" :src="'/static/imgs/card/phone'+item.icon+'.png'"
|
|
|
+ width="12px" height="13px"></u--image>
|
|
|
<view class='icon-text'>{{ item.phone }}</view>
|
|
|
</view>
|
|
|
<view @click='remarkEdit(item)' class="row2 flex" style="color: #808080">
|
|
|
- <u--image :showLoading="true" :src="'/static/imgs/card/remark'+item.icon+'.png'" width="10px"
|
|
|
- height="12px"></u--image>
|
|
|
+ <u--image :showLoading="true" :src="'/static/imgs/card/remark'+item.icon+'.png'"
|
|
|
+ width="10px" height="12px"></u--image>
|
|
|
<view class='icon-text' style="color: #808080;">{{item.remark?item.remark:'单击添加备注'}}
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -138,18 +139,19 @@
|
|
|
</view>
|
|
|
<view class="right">
|
|
|
<view @click="toMap(item)" class="row1 flex">
|
|
|
- <u--image :showLoading="true" :src="'/static/imgs/card/address'+item.icon+'.png'" width="13px"
|
|
|
+ <u--image :showLoading="true"
|
|
|
+ :src="'/static/imgs/card/address'+item.icon+'.png'" width="13px"
|
|
|
height="16px"></u--image>
|
|
|
<view class='icon-text'>{{ item.province }}{{ item.city }}{{ item.area }}</view>
|
|
|
</view>
|
|
|
<view @click="freeTell(item)" class="row2 flex">
|
|
|
- <u--image :showLoading="true" :src="'/static/imgs/card/phone'+item.icon+'.png'" width="12px"
|
|
|
- height="13px"></u--image>
|
|
|
+ <u--image :showLoading="true" :src="'/static/imgs/card/phone'+item.icon+'.png'"
|
|
|
+ width="12px" height="13px"></u--image>
|
|
|
<view class='icon-text'>{{ item.phone }}</view>
|
|
|
</view>
|
|
|
<view @click='remarkEdit(item)' class="row2 flex" style="color: #808080">
|
|
|
- <u--image :showLoading="true" :src="'/static/imgs/card/remark'+item.icon+'.png'" width="10px"
|
|
|
- height="12px"></u--image>
|
|
|
+ <u--image :showLoading="true" :src="'/static/imgs/card/remark'+item.icon+'.png'"
|
|
|
+ width="10px" height="12px"></u--image>
|
|
|
<view class='icon-text' style="color: #808080;">
|
|
|
{{item.remark?item.remark:'单击添加备注'}}
|
|
|
</view>
|
|
|
@@ -178,23 +180,24 @@
|
|
|
<view class="left">
|
|
|
<u--image :showLoading="true" :src="item.headSculpture" width="66px" height="66px"
|
|
|
shape="circle" v-if="item.headSculpture"></u--image>
|
|
|
- <u--image :showLoading="true" src="/static/imgs/card/defaulthead.png"
|
|
|
- width="66px" height="66px" shape="circle" v-else></u--image>
|
|
|
+ <u--image :showLoading="true" src="/static/imgs/card/defaulthead.png" width="66px"
|
|
|
+ height="66px" shape="circle" v-else></u--image>
|
|
|
</view>
|
|
|
<view class="right">
|
|
|
<view @click="toMap(item)" class="row1 flex">
|
|
|
- <u--image :showLoading="true" :src="'/static/imgs/card/address'+item.icon+'.png'" width="13px"
|
|
|
+ <u--image :showLoading="true"
|
|
|
+ :src="'/static/imgs/card/address'+item.icon+'.png'" width="13px"
|
|
|
height="16px"></u--image>
|
|
|
<view class='icon-text'>{{ item.province }}{{ item.city }}{{ item.area }}</view>
|
|
|
</view>
|
|
|
<view @click="freeTell(item)" class="row2 flex">
|
|
|
- <u--image :showLoading="true" :src="'/static/imgs/card/phone'+item.icon+'.png'" width="12px"
|
|
|
- height="13px"></u--image>
|
|
|
+ <u--image :showLoading="true" :src="'/static/imgs/card/phone'+item.icon+'.png'"
|
|
|
+ width="12px" height="13px"></u--image>
|
|
|
<view class='icon-text'>{{ item.phone }}</view>
|
|
|
</view>
|
|
|
<view @click='remarkEdit(item)' class="row2 flex" style="color: #808080">
|
|
|
- <u--image :showLoading="true" :src="'/static/imgs/card/remark'+item.icon+'.png'" width="10px"
|
|
|
- height="12px"></u--image>
|
|
|
+ <u--image :showLoading="true" :src="'/static/imgs/card/remark'+item.icon+'.png'"
|
|
|
+ width="10px" height="12px"></u--image>
|
|
|
<view :style='item.remark?"color:#000;":"color:#808080;"' class='icon-text'>
|
|
|
{{item.remark?item.remark:'单击添加备注'}}
|
|
|
</view>
|
|
|
@@ -210,8 +213,8 @@
|
|
|
</view>
|
|
|
<view class="car-bottom flex">
|
|
|
<view class="left">
|
|
|
- <image src="../../static/imgs/card/home.png" mode="widthFix" style="width: 32rpx;height: auto;"
|
|
|
- @click="toHome(item)"></image>
|
|
|
+ <image src="../../static/imgs/card/home.png" mode="widthFix"
|
|
|
+ style="width: 32rpx;height: auto;" @click="toHome(item)"></image>
|
|
|
<text @click='switchType(item)'
|
|
|
style="color: #fff;font-size: 36rpx;font-weight: 700;">{{item.classify?item.classifyName:'默'}}</text>
|
|
|
<image v-if='item.shareCard==1' src="../../static/imgs/card/share.png" mode="widthFix"
|
|
|
@@ -243,13 +246,14 @@
|
|
|
</view>
|
|
|
|
|
|
</view>
|
|
|
- <u-picker :immediateChange ="true" :show="isShowType" :columns="typeColumns" keyName="circleName" :title="type == 2?'修改分类':'选择分类'"
|
|
|
- @close="isShowType=false" @cancel="isShowType=false" closeOnClickOverlay @confirm="typeConfirm"></u-picker>
|
|
|
+ <u-picker :immediateChange="true" :show="isShowType" :columns="typeColumns" keyName="circleName"
|
|
|
+ :title="type == 2?'修改分类':'选择分类'" @close="isShowType=false" @cancel="isShowType=false" closeOnClickOverlay
|
|
|
+ @confirm="typeConfirm"></u-picker>
|
|
|
<u-toast ref="uToast"></u-toast>
|
|
|
<u-modal :show="delShow" title="提示" confirmText='确定' showCancelButton='true' @cancel="delShow=false"
|
|
|
@confirm="delConfirm" :content='"已选中"+this.checkedList.length+"张名片，确定删除？"'></u-modal>
|
|
|
<u-modal :show="modalShow" @confirm='remarkConfirm' :confirmColor="remark?'#2979ff':'#ccc'"
|
|
|
- showCancelButton='true' title="备注" @cancel="modalShow=false">
|
|
|
+ showCancelButton='true' title="备注" @cancel="modalShow=false">
|
|
|
<view class="slot-content">
|
|
|
<u--textarea v-model="remark" placeholder="输入备注，不超过150个字"></u--textarea>
|
|
|
</view>
|
|
|
@@ -296,56 +300,57 @@
|
|
|
<button class="confirm" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">授权手机号</button>
|
|
|
</view>
|
|
|
</u-popup> -->
|
|
|
- <u-modal :show="showAuthorizePhone"
|
|
|
- :showConfirmButton="false">
|
|
|
+ <u-modal :show="showAuthorizePhone" :showConfirmButton="false">
|
|
|
<view class="slot-content">
|
|
|
<view class="auth-card">
|
|
|
<view class="img">
|
|
|
- <img class="avatar-img"
|
|
|
- src="@/static/imgs/logo.png"
|
|
|
- mode="widthFix">
|
|
|
+ <img class="avatar-img" src="@/static/imgs/logo.png" mode="widthFix">
|
|
|
</view>
|
|
|
<!-- <div class="title">手机登录后才能查看名片哦~</div> -->
|
|
|
<view class="content">手机登录后才能查看名片哦~</view>
|
|
|
</view>
|
|
|
<view class="auth-btncard">
|
|
|
<view class="btn-unok">
|
|
|
- <u-button :customStyle="customStyleUnOk" @click="showAuthorizePhone=false" :plain="true"> 拒绝</u-button>
|
|
|
+ <u-button :customStyle="customStyleUnOk" @click="showAuthorizePhone=false" :plain="true">
|
|
|
+ 拒绝</u-button>
|
|
|
</view>
|
|
|
<view class="btn-ok">
|
|
|
- <u-button :customStyle="customStyleOk" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber"> 立即登录</u-button>
|
|
|
- </view>
|
|
|
+ <u-button :customStyle="customStyleOk" open-type="getPhoneNumber"
|
|
|
+ @getphonenumber="getPhoneNumber"> 立即登录</u-button>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
</view>
|
|
|
</u-modal>
|
|
|
- <u-modal :show="showAuthorizeUser"
|
|
|
- :showConfirmButton="false">
|
|
|
+ <u-modal :show="showAuthorizeUser" :showConfirmButton="false">
|
|
|
<view class="slot-content">
|
|
|
<div class="auth-card">
|
|
|
<div class="img">
|
|
|
- <img class="avatar-img"
|
|
|
- src="/static/imgs/logo.png"
|
|
|
- mode="widthFix">
|
|
|
+ <img class="avatar-img" src="/static/imgs/logo.png" mode="widthFix">
|
|
|
</div>
|
|
|
<div class="content">邀请您补全个人信息<br></br>（昵称、头像）</div>
|
|
|
- <div style="margin-left: 100rpx;margin-right: 100rpx">
|
|
|
- <u-form :model="userInfo" ref="uForm">
|
|
|
- <u-form-item label="头像">
|
|
|
- <button class="avatar-wrapper" open-type="chooseAvatar" @chooseavatar="onChooseAvatar" slot="right">
|
|
|
- <image class="avatar" :src="userInfo.head?userInfo.head:'https://mmbiz.qpic.cn/mmbiz/icTdbqWNOwNRna42FI242Lcia07jQodd2FJGIYQfG0LAJGFxM4FbnQP6yfMxBgJ0F3YRqJCJ1aPAK2dQagdusBZg/0'"></image>
|
|
|
- </button>
|
|
|
- </u-form-item>
|
|
|
- <u-form-item label="昵称">
|
|
|
- <u-input inputAlign='right' v-model="userInfo.nickname" class="weui-input" @blur="userNameInput" placeholder="请输入昵称" border="false"/>
|
|
|
- <!-- <input type="nickname" :value="userInfo.nickname" class="weui-input" @blur="userNameInput" placeholder="请输入昵称"/> -->
|
|
|
- </u-form-item>
|
|
|
- </u-form>
|
|
|
+ <div style="margin-left: 100rpx;margin-right: 100rpx">
|
|
|
+ <u-form :model="userInfo" ref="uForm">
|
|
|
+ <u-form-item label="头像">
|
|
|
+ <button class="avatar-wrapper" open-type="chooseAvatar" @chooseavatar="onChooseAvatar"
|
|
|
+ slot="right">
|
|
|
+ <image class="avatar"
|
|
|
+ :src="userInfo.head?userInfo.head:'https://mmbiz.qpic.cn/mmbiz/icTdbqWNOwNRna42FI242Lcia07jQodd2FJGIYQfG0LAJGFxM4FbnQP6yfMxBgJ0F3YRqJCJ1aPAK2dQagdusBZg/0'">
|
|
|
+ </image>
|
|
|
+ </button>
|
|
|
+ </u-form-item>
|
|
|
+ <u-form-item label="昵称">
|
|
|
+ <u-input inputAlign='right' v-model="userInfo.nickname" class="weui-input"
|
|
|
+ @blur="userNameInput" placeholder="请输入昵称" border="false" />
|
|
|
+ <!-- <input type="nickname" :value="userInfo.nickname" class="weui-input" @blur="userNameInput" placeholder="请输入昵称"/> -->
|
|
|
+ </u-form-item>
|
|
|
+ </u-form>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
+ <div class="auth-btncard">
|
|
|
+ <div class="btn-unok"><u-button :customStyle="customStyleUnOk" @click="showAuthorizeUser=false">
|
|
|
+ 拒绝</u-button></div>
|
|
|
+ <div class="btn-ok"><u-button :customStyle="customStyleOk" @click="authUser"> 允许</u-button></div>
|
|
|
</div>
|
|
|
- <div class="auth-btncard">
|
|
|
- <div class="btn-unok"><u-button :customStyle="customStyleUnOk" @click="showAuthorizeUser=false"> 拒绝</u-button></div>
|
|
|
- <div class="btn-ok"><u-button :customStyle="customStyleOk" @click="authUser"> 允许</u-button></div>
|
|
|
- </div>
|
|
|
</view>
|
|
|
</u-modal>
|
|
|
|
|
|
@@ -357,7 +362,10 @@
|
|
|
<script>
|
|
|
var that;
|
|
|
import Poster from '../../components/zhangyuhao-poster/Poster.vue'
|
|
|
- import { pathToBase64, base64ToPath } from 'image-tools'
|
|
|
+ import {
|
|
|
+ pathToBase64,
|
|
|
+ base64ToPath
|
|
|
+ } from 'image-tools'
|
|
|
import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
|
|
|
export default {
|
|
|
mixins: [MescrollMixin],
|
|
|
@@ -366,10 +374,13 @@
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
- userInfo: {head:'',nickname:''},
|
|
|
+ userInfo: {
|
|
|
+ head: '',
|
|
|
+ nickname: ''
|
|
|
+ },
|
|
|
downOption: {
|
|
|
auto: false,
|
|
|
- textColor:'#bbb'
|
|
|
+ textColor: '#bbb'
|
|
|
},
|
|
|
upOption: {
|
|
|
page: {
|
|
|
@@ -377,8 +388,8 @@
|
|
|
},
|
|
|
auto: false,
|
|
|
noMoreSize: 1,
|
|
|
- textNoMore:'没有更多了~',
|
|
|
- textColor:'#bbb'
|
|
|
+ textNoMore: '没有更多了~',
|
|
|
+ textColor: '#bbb'
|
|
|
},
|
|
|
params: {
|
|
|
encryptedData: '',
|
|
|
@@ -414,29 +425,50 @@
|
|
|
showAuthorizeUser: false,
|
|
|
showAuthorizePhone: false,
|
|
|
customStyleUnOk: {
|
|
|
- marginTop:'20rpx',
|
|
|
- color:'#18254C',
|
|
|
- border:'2px solid #18254C',
|
|
|
+ marginTop: '20rpx',
|
|
|
+ color: '#18254C',
|
|
|
+ border: '2px solid #18254C',
|
|
|
"border-radius": "10px",
|
|
|
- fontSize:"32rpx"
|
|
|
+ fontSize: "32rpx"
|
|
|
},
|
|
|
customStyleOk: {
|
|
|
- marginTop:'20rpx',
|
|
|
- color:'#fff',
|
|
|
- border:'2px solid #18254C',
|
|
|
+ marginTop: '20rpx',
|
|
|
+ color: '#fff',
|
|
|
+ border: '2px solid #18254C',
|
|
|
"border-radius": "10px",
|
|
|
- fontSize:"32rpx",
|
|
|
- background:"#18254C"
|
|
|
+ fontSize: "32rpx",
|
|
|
+ background: "#18254C"
|
|
|
},
|
|
|
};
|
|
|
},
|
|
|
mounted() {
|
|
|
|
|
|
},
|
|
|
- onShow:function(){
|
|
|
+ onShow: function() {
|
|
|
let _isLoad = uni.getStorageSync("scanAddCardToIndex")
|
|
|
this.searchVal = uni.getStorageSync("search_val") ? uni.getStorageSync("search_val") : ''
|
|
|
- if(this.searchVal||_isLoad) this.mescroll.resetUpScroll();
|
|
|
+ if (this.searchVal || _isLoad) this.mescroll.resetUpScroll();
|
|
|
+ if (uni.getStorageSync("userInfo").phone) {
|
|
|
+ that.$request.baseRequest('admin.unimall.cardNewsInfo', 'list', {
|
|
|
+ receiveId: uni.getStorageSync("userInfo").id,
|
|
|
+ }, failres => {
|
|
|
+ console.log('res+++++', failres.errmsg)
|
|
|
+ that.$refs.uToast.show({
|
|
|
+ type: 'error',
|
|
|
+ message: failres.errmsg,
|
|
|
+ })
|
|
|
+ }).then(res => {
|
|
|
+ that.noticeList = res.data.items
|
|
|
+ if (that.noticeList.length > 0) {
|
|
|
+ var data = that.noticeList.filter((item) => {
|
|
|
+ return item.newsFlag == 0
|
|
|
+ })
|
|
|
+ that.unread = data ? data.length : 0
|
|
|
+ }
|
|
|
+ console.log(that.unread)
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
},
|
|
|
onLoad: function(options) {
|
|
|
that = this
|
|
|
@@ -445,34 +477,17 @@
|
|
|
this.userInfo = uni.getStorageSync("userInfo")
|
|
|
this.$nextTick(function() {
|
|
|
that.mescroll.resetUpScroll()
|
|
|
- that.$request.baseRequest('admin.unimall.cardNewsInfo', 'list', {
|
|
|
- receiveId: uni.getStorageSync("userInfo").id,
|
|
|
- }, failres => {
|
|
|
- console.log('res+++++', failres.errmsg)
|
|
|
- that.$refs.uToast.show({
|
|
|
- type: 'error',
|
|
|
- message: failres.errmsg,
|
|
|
- })
|
|
|
- }).then(res => {
|
|
|
- that.noticeList = res.data.items
|
|
|
- if (that.noticeList.length > 0) {
|
|
|
- var data = that.noticeList.filter((item) => {
|
|
|
- return item.newsFlag == 0
|
|
|
- })
|
|
|
- that.unread = data ? data.length : 0
|
|
|
- }
|
|
|
- console.log(that.unread)
|
|
|
- })
|
|
|
+
|
|
|
wx.showShareMenu({
|
|
|
withShareTicket: true,
|
|
|
menus: ["shareAppMessage", "shareTimeline"]
|
|
|
})
|
|
|
});
|
|
|
-
|
|
|
+
|
|
|
} else {
|
|
|
if (uni.getLaunchOptionsSync().scene != 1154) {
|
|
|
this.login()
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
this.status = uni.getLaunchOptionsSync().scene
|
|
|
@@ -482,7 +497,7 @@
|
|
|
icon: 'none',
|
|
|
duration: 10000
|
|
|
});
|
|
|
- }
|
|
|
+ }
|
|
|
|
|
|
},
|
|
|
onShareAppMessage(res) {
|
|
|
@@ -508,36 +523,36 @@
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
- //获取昵称输入内容
|
|
|
- userNameInput(e){
|
|
|
- this.userInfo.nickname = e.detail.value
|
|
|
- },
|
|
|
- async onChooseAvatar(e) {
|
|
|
- this.$set(this.userInfo,"head",await this.toBase64(e.detail.avatarUrl))
|
|
|
- },
|
|
|
- toBase64(url){
|
|
|
- return new Promise(resolve => {
|
|
|
- pathToBase64(url).then(path => {
|
|
|
- resolve(path);
|
|
|
- }).catch(error => {
|
|
|
- console.log(error)
|
|
|
- })
|
|
|
+ //获取昵称输入内容
|
|
|
+ userNameInput(e) {
|
|
|
+ this.userInfo.nickname = e.detail.value
|
|
|
+ },
|
|
|
+ async onChooseAvatar(e) {
|
|
|
+ this.$set(this.userInfo, "head", await this.toBase64(e.detail.avatarUrl))
|
|
|
+ },
|
|
|
+ toBase64(url) {
|
|
|
+ return new Promise(resolve => {
|
|
|
+ pathToBase64(url).then(path => {
|
|
|
+ resolve(path);
|
|
|
+ }).catch(error => {
|
|
|
+ console.log(error)
|
|
|
})
|
|
|
- },
|
|
|
- authUser(){
|
|
|
- if(this.userInfo.nickname==''){
|
|
|
- uni.showToast({
|
|
|
- icon:"none",
|
|
|
- title: '请输入您的昵称',
|
|
|
- duration: 2000
|
|
|
- });
|
|
|
- return;
|
|
|
- }
|
|
|
- this.getTokenAsync1()
|
|
|
-
|
|
|
- },
|
|
|
-
|
|
|
- downCallback(){
|
|
|
+ })
|
|
|
+ },
|
|
|
+ authUser() {
|
|
|
+ if (this.userInfo.nickname == '') {
|
|
|
+ uni.showToast({
|
|
|
+ icon: "none",
|
|
|
+ title: '请输入您的昵称',
|
|
|
+ duration: 2000
|
|
|
+ });
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ this.getTokenAsync1()
|
|
|
+
|
|
|
+ },
|
|
|
+
|
|
|
+ downCallback() {
|
|
|
this.mescroll.resetUpScroll()
|
|
|
},
|
|
|
freeTell(item) {
|
|
|
@@ -581,9 +596,9 @@
|
|
|
commonUserInfo: JSON.stringify(that.userInfo)
|
|
|
}, failres => {
|
|
|
uni.showToast({
|
|
|
- icon:"none",
|
|
|
- title: failres.errmsg,
|
|
|
- duration: 3000
|
|
|
+ icon: "none",
|
|
|
+ title: failres.errmsg,
|
|
|
+ duration: 3000
|
|
|
});
|
|
|
uni.hideLoading()
|
|
|
}).then(res1 => {
|
|
|
@@ -599,9 +614,9 @@
|
|
|
commonUserInfo: JSON.stringify(that.userInfo)
|
|
|
}, failres => {
|
|
|
uni.showToast({
|
|
|
- icon:"none",
|
|
|
- title: failres.errmsg,
|
|
|
- duration: 3000
|
|
|
+ icon: "none",
|
|
|
+ title: failres.errmsg,
|
|
|
+ duration: 3000
|
|
|
});
|
|
|
uni.hideLoading()
|
|
|
}).then(res1 => {
|
|
|
@@ -663,10 +678,11 @@
|
|
|
},
|
|
|
{
|
|
|
type: 'image',
|
|
|
- path: this.currectData.headSculpture?this.currectData.headSculpture:'../../static/imgs/card/defaulthead.png',
|
|
|
+ path: this.currectData.headSculpture ? this.currectData.headSculpture :
|
|
|
+ '../../static/imgs/card/defaulthead.png',
|
|
|
shape: 'circle',
|
|
|
use: 'head',
|
|
|
- imageType:this.currectData.headSculpture?'wl':'bd',
|
|
|
+ imageType: this.currectData.headSculpture ? 'wl' : 'bd',
|
|
|
x: 30,
|
|
|
y: 30,
|
|
|
width: 100,
|
|
|
@@ -942,18 +958,18 @@
|
|
|
}, failres => {
|
|
|
console.log('res+++++', failres.errmsg)
|
|
|
uni.showToast({
|
|
|
- icon:"none",
|
|
|
- title: failres.errmsg,
|
|
|
- duration: 3000
|
|
|
+ icon: "none",
|
|
|
+ title: failres.errmsg,
|
|
|
+ duration: 3000
|
|
|
});
|
|
|
}).then(res => {
|
|
|
console.log(i, this.checkedList.length - 1)
|
|
|
if (i == this.checkedList.length - 1) {
|
|
|
uni.hideLoading()
|
|
|
uni.showToast({
|
|
|
- icon:"success",
|
|
|
- title: '删除成功！',
|
|
|
- duration: 2000
|
|
|
+ icon: "success",
|
|
|
+ title: '删除成功！',
|
|
|
+ duration: 2000
|
|
|
});
|
|
|
this.delShow = false
|
|
|
this.islongPress = false
|
|
|
@@ -968,9 +984,9 @@
|
|
|
this.delShow = true
|
|
|
} else {
|
|
|
uni.showToast({
|
|
|
- icon:"none",
|
|
|
- title: '请勾选后再进行删除',
|
|
|
- duration: 2000
|
|
|
+ icon: "none",
|
|
|
+ title: '请勾选后再进行删除',
|
|
|
+ duration: 2000
|
|
|
});
|
|
|
}
|
|
|
},
|
|
|
@@ -1030,17 +1046,17 @@
|
|
|
}, failres => {
|
|
|
console.log('res+++++', failres.errmsg)
|
|
|
uni.showToast({
|
|
|
- icon:"none",
|
|
|
- title: failres.errmsg,
|
|
|
- duration: 3000
|
|
|
+ icon: "none",
|
|
|
+ title: failres.errmsg,
|
|
|
+ duration: 3000
|
|
|
});
|
|
|
}).then(res => {
|
|
|
uni.showToast({
|
|
|
- icon:"success",
|
|
|
- title: '修改备注成功！',
|
|
|
- duration: 2000
|
|
|
+ icon: "success",
|
|
|
+ title: '修改备注成功！',
|
|
|
+ duration: 2000
|
|
|
});
|
|
|
- this.remark=''
|
|
|
+ this.remark = ''
|
|
|
this.modalShow = false
|
|
|
this.mescroll.resetUpScroll()
|
|
|
})
|
|
|
@@ -1059,28 +1075,28 @@
|
|
|
},
|
|
|
typeConfirm(e) {
|
|
|
if (this.type == 2) {
|
|
|
- console.log(e.value[0].circleName,"123312132")
|
|
|
- this.$set(this.currectData,'classify',e.value[0].circleName)
|
|
|
+ console.log(e.value[0].circleName, "123312132")
|
|
|
+ this.$set(this.currectData, 'classify', e.value[0].circleName)
|
|
|
this.$request.baseRequest('admin.unimall.cardHolderInfo', 'update', {
|
|
|
cardHolderInfo: JSON.stringify(this.currectData),
|
|
|
}, failres => {
|
|
|
console.log('res+++++', failres.errmsg)
|
|
|
uni.showToast({
|
|
|
- icon:"none",
|
|
|
- title: failres.errmsg,
|
|
|
- duration: 3000
|
|
|
+ icon: "none",
|
|
|
+ title: failres.errmsg,
|
|
|
+ duration: 3000
|
|
|
});
|
|
|
}).then(res => {
|
|
|
uni.showToast({
|
|
|
- icon:"success",
|
|
|
- title: '修改分类成功！',
|
|
|
- duration: 2000
|
|
|
+ icon: "success",
|
|
|
+ title: '修改分类成功！',
|
|
|
+ duration: 2000
|
|
|
});
|
|
|
this.mescroll.resetUpScroll()
|
|
|
})
|
|
|
} else {
|
|
|
this.typeName = e.value[0].circleName
|
|
|
- if(this.typeName =="全部分类") this.typeName = ''
|
|
|
+ if (this.typeName == "全部分类") this.typeName = ''
|
|
|
this.mescroll.resetUpScroll()
|
|
|
}
|
|
|
this.isShowType = false
|
|
|
@@ -1094,7 +1110,7 @@
|
|
|
});
|
|
|
} else {
|
|
|
var that = this
|
|
|
- if(uni.getStorageSync("userInfo").id){
|
|
|
+ if (uni.getStorageSync("userInfo").id) {
|
|
|
uni.showLoading({
|
|
|
title: '数据加载中'
|
|
|
})
|
|
|
@@ -1103,13 +1119,13 @@
|
|
|
limit: page.size,
|
|
|
commonId: uni.getStorageSync("userInfo").id,
|
|
|
searchContent: this.searchVal,
|
|
|
- classify:this.typeName
|
|
|
+ classify: this.typeName
|
|
|
}, failres => {
|
|
|
console.log('res+++++', failres.errmsg)
|
|
|
uni.showToast({
|
|
|
- icon:"none",
|
|
|
- title: failres.errmsg,
|
|
|
- duration: 3000
|
|
|
+ icon: "none",
|
|
|
+ title: failres.errmsg,
|
|
|
+ duration: 3000
|
|
|
});
|
|
|
uni.hideLoading()
|
|
|
}).then(res => {
|
|
|
@@ -1128,10 +1144,10 @@
|
|
|
this.$nextTick(() => {
|
|
|
that.mescroll.endBySize(curPageLen, totalPage)
|
|
|
});
|
|
|
-
|
|
|
+
|
|
|
uni.hideLoading()
|
|
|
})
|
|
|
-
|
|
|
+
|
|
|
await this.$request.baseRequest('admin.unimall.cardClassifyInfo', 'list', {
|
|
|
page: 1,
|
|
|
limit: 9999,
|
|
|
@@ -1139,22 +1155,22 @@
|
|
|
}, failres => {
|
|
|
console.log('res+++++', failres.errmsg)
|
|
|
uni.showToast({
|
|
|
- icon:"none",
|
|
|
- title: failres.errmsg,
|
|
|
- duration: 3000
|
|
|
+ icon: "none",
|
|
|
+ title: failres.errmsg,
|
|
|
+ duration: 3000
|
|
|
});
|
|
|
}).then(res => {
|
|
|
res.data.items.unshift({
|
|
|
- circleName:'全部分类'
|
|
|
+ circleName: '全部分类'
|
|
|
})
|
|
|
this.typeColumns = [res.data.items]
|
|
|
-
|
|
|
+
|
|
|
console.log(this.typeColumns)
|
|
|
})
|
|
|
//清楚扫码添加跳页刷新数据状态开关
|
|
|
- uni.setStorageSync("scanAddCardToIndex",0)
|
|
|
+ uni.setStorageSync("scanAddCardToIndex", 0)
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
},
|
|
|
login() {
|
|
|
@@ -1167,9 +1183,9 @@
|
|
|
raw: JSON.stringify(wxres)
|
|
|
}, failres => {
|
|
|
uni.showToast({
|
|
|
- icon:"none",
|
|
|
- title: failres.errmsg,
|
|
|
- duration: 3000
|
|
|
+ icon: "none",
|
|
|
+ title: failres.errmsg,
|
|
|
+ duration: 3000
|
|
|
});
|
|
|
uni.hideLoading()
|
|
|
}).then(res => {
|
|
|
@@ -1181,9 +1197,9 @@
|
|
|
},
|
|
|
fail: function(err) {
|
|
|
uni.showToast({
|
|
|
- icon:"none",
|
|
|
- title: err.code,
|
|
|
- duration: 3000
|
|
|
+ icon: "none",
|
|
|
+ title: err.code,
|
|
|
+ duration: 3000
|
|
|
});
|
|
|
// 登录授权失败
|
|
|
// err.code是错误码
|
|
|
@@ -1263,23 +1279,24 @@
|
|
|
console.log('条码类型：' + res.scanType);
|
|
|
console.log('条码内容：' + res.result);
|
|
|
// console.log(res.result.split("=")[1],res.result.split("=")[1].indexOf(','),res.result.split("=")[1].split(",")[0])
|
|
|
- var cardId=res.result.split("=")[1].split(",")[0]
|
|
|
+ var cardId = res.result.split("=")[1].split(",")[0]
|
|
|
that.$request.baseRequest('admin.unimall.cardHolderInfo', 'getAdded', {
|
|
|
commonId: uni.getStorageSync("userInfo").id,
|
|
|
- cardId:cardId
|
|
|
+ cardId: cardId
|
|
|
}, failres => {
|
|
|
console.log('res+++++', failres.errmsg)
|
|
|
uni.showToast({
|
|
|
- icon:"none",
|
|
|
- title: failres.errmsg,
|
|
|
- duration: 3000
|
|
|
+ icon: "none",
|
|
|
+ title: failres.errmsg,
|
|
|
+ duration: 3000
|
|
|
});
|
|
|
}).then(res1 => {
|
|
|
uni.navigateTo({
|
|
|
- url: "/pages/cardHolder/scanCodeAddCard?id=" + res.result.split("=")[1]
|
|
|
+ url: "/pages/cardHolder/scanCodeAddCard?id=" + res.result
|
|
|
+ .split("=")[1]
|
|
|
})
|
|
|
})
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
@@ -1318,19 +1335,22 @@
|
|
|
box-sizing: border-box;
|
|
|
margin-right: 20rpx;
|
|
|
}
|
|
|
- .left{
|
|
|
- width:80%;
|
|
|
- text{
|
|
|
- height: 46rpx;
|
|
|
- white-space: nowrap;
|
|
|
- overflow: scroll;
|
|
|
- position: relative;
|
|
|
- margin-left: 20rpx;
|
|
|
+
|
|
|
+ .left {
|
|
|
+ width: 80%;
|
|
|
+
|
|
|
+ text {
|
|
|
+ height: 46rpx;
|
|
|
+ white-space: nowrap;
|
|
|
+ overflow: scroll;
|
|
|
+ position: relative;
|
|
|
+ margin-left: 20rpx;
|
|
|
}
|
|
|
}
|
|
|
- .right{
|
|
|
+
|
|
|
+ .right {
|
|
|
// width:14%;
|
|
|
- margin-right:20rpx
|
|
|
+ margin-right: 20rpx
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -1350,9 +1370,11 @@
|
|
|
background: #f5f5f5;
|
|
|
// height: 1000px;
|
|
|
border-radius: 30rpx;
|
|
|
- .item{
|
|
|
+
|
|
|
+ .item {
|
|
|
border-radius: 30rpx;
|
|
|
}
|
|
|
+
|
|
|
.style1 {
|
|
|
display: flex;
|
|
|
width: 100%;
|
|
|
@@ -1665,48 +1687,59 @@
|
|
|
background-color: green;
|
|
|
overflow: scroll !important;
|
|
|
}
|
|
|
- .auth-btncard{
|
|
|
- display: flex!important;
|
|
|
- justify-content: space-between!important;
|
|
|
- .btn-unok{
|
|
|
- width: 40%;
|
|
|
- }
|
|
|
- .btn-ok{
|
|
|
- width: 40%;
|
|
|
- }
|
|
|
+
|
|
|
+ .auth-btncard {
|
|
|
+ display: flex !important;
|
|
|
+ justify-content: space-between !important;
|
|
|
+
|
|
|
+ .btn-unok {
|
|
|
+ width: 40%;
|
|
|
+ }
|
|
|
+
|
|
|
+ .btn-ok {
|
|
|
+ width: 40%;
|
|
|
+ }
|
|
|
}
|
|
|
- .auth-card{
|
|
|
- text-align: center;
|
|
|
- .avatar-img{
|
|
|
- width: 250rpx;
|
|
|
- }
|
|
|
- .title{
|
|
|
- font-size: 20rpx;
|
|
|
- }
|
|
|
- .content{
|
|
|
+
|
|
|
+ .auth-card {
|
|
|
+ text-align: center;
|
|
|
+
|
|
|
+ .avatar-img {
|
|
|
+ width: 250rpx;
|
|
|
+ }
|
|
|
+
|
|
|
+ .title {
|
|
|
+ font-size: 20rpx;
|
|
|
+ }
|
|
|
+
|
|
|
+ .content {
|
|
|
font-size: 32rpx;
|
|
|
font-weight: bold;
|
|
|
color: #1A1A1A;
|
|
|
- margin-bottom: 30rpx;
|
|
|
- }
|
|
|
+ margin-bottom: 30rpx;
|
|
|
+ }
|
|
|
}
|
|
|
- .avatar-wrapper{
|
|
|
+
|
|
|
+ .avatar-wrapper {
|
|
|
color: #333 !important;
|
|
|
border: none !important;
|
|
|
- border-radius:0 !important;
|
|
|
- background-color:transparent !important;
|
|
|
+ border-radius: 0 !important;
|
|
|
+ background-color: transparent !important;
|
|
|
padding: 0;
|
|
|
}
|
|
|
+
|
|
|
.avatar-wrapper::after {
|
|
|
border: none !important;
|
|
|
}
|
|
|
- .avatar{
|
|
|
+
|
|
|
+ .avatar {
|
|
|
width: 100rpx;
|
|
|
height: 100rpx;
|
|
|
overflow: hidden;
|
|
|
border-radius: 100%;
|
|
|
}
|
|
|
- /deep/.u-popup__content{
|
|
|
- border-radius: 20rpx!important;
|
|
|
+
|
|
|
+ /deep/.u-popup__content {
|
|
|
+ border-radius: 20rpx !important;
|
|
|
}
|
|
|
</style>
|
