Commit bb4a9a87 by liangjianmin

css

parent f7f3251a
......@@ -50,7 +50,7 @@
"quickapp" : {},
/* 小程序特有相关 */
"mp-weixin" : {
"appid" : "wx060bcd34e30d0db2",
"appid" : "wx47674efb6eef06e1",
"setting" : {
"urlCheck" : false,
"es6" : true,
......
......@@ -3,7 +3,7 @@
<view class="notice column">
<text class="title">公告通知</text>
<view class="list column">
<navigator class="box row bothSide verCenter" hover-class="none" url="/pages/index/notice" v-for="item in noticeData">
<navigator class="box row bothSide verCenter" hover-class="none" :url="'/pages/index/notice?id='+item.id" v-for="item in noticeData">
<view class="row verCenter">
<text class="arrow"></text>
<text class="content">{{ item.notice_title }}</text>
......@@ -15,13 +15,13 @@
<view class="tab row">
<view class="box row" @click="changeTab(index)" :class="{ curr: index == currentIndex }" :key="index" v-for="(item, index) in textArr">
<text>{{ item }}</text>
<text class="num">({{ total }})</text>
<text class="num" v-if="index == 0">({{ total }})</text>
</view>
</view>
<view class="section">
<view class="list column">
<template v-if="list.length > 0">
<navigator class="box row bothSide" :class="{ curr: item.is_urgent != '' }" :url="item.ask_customer_status == 2 ? '/pages/question/detail?id=' + item.ask_customer_problem_list_id: '/pages/question/handle?id=' + item.ask_customer_problem_list_id" hover-class="none" v-for="item in list">
<navigator class="box row bothSide" :class="{ curr: item.is_urgent == '紧急' }" :url="item.ask_customer_status == 2 ? '/pages/question/detail?id=' + item.ask_customer_problem_list_id: '/pages/question/handle?id=' + item.ask_customer_problem_list_id" hover-class="none" v-for="item in list">
<view class="base-info column">
<view class="row verCenter mb20">
<view class="t1">{{ item.erp_order_sn }}</view>
......@@ -35,10 +35,10 @@
</view>
<view class="time-info">
<!-- 紧急情况区分 -->
<template v-if="item.is_urgent != ''">
<template v-if="item.is_urgent == '紧急'">
<view class="status0 row verCenter">
<text class="iconfont icon-jinggao"></text>
<span>紧急</span>
<span>{{item.is_urgent}}</span>
</view>
</template>
<template v-else>
......@@ -132,6 +132,12 @@ export default {
this.flag = true;
this.more = 'noMore';
}
} else if (res.err_code === 20046) {
this.is_login = true;
this.flag = true;
this.more = 'noMore';
this.list = [];
this.total = 0;
} else if (res.err_code === 20045) {
this.is_login = false;
this.flag = true;
......
<template>
<view class="notice">
<view class="title column">
<text class="tit">全球领先元器件分销商得捷电子Digi-Key香港供应链台风放假通知</text>
<text class="tit">{{ noticeData[0].notice_title }}</text>
<text class="time">
<text class="t1">发布日期:</text>
<text class="t2">2021.09.02 17:12</text>
<text class="t2">{{ noticeData[0].notice_time }}</text>
</text>
</view>
<view class="section">
尊敬的新老客户:
为了确保所有客户购买的都是商城最新批次进货的物料,即日起商城将严格实施仓储管理先进先出的理念,后续发货会存在同款编带物料2段发货的可能(单款编带物料整盘的除外),例如整盘/盒数量为5000,实际购买数量为9000或4000时,非整盘部分可能分为2段2000或者1段500和1段3500等现象,但在商城没有另外通知的情况下,我司确保不会出现超过2段以上的情况,
我司不接受订单内备注不需要接段,恕不接受此类投诉,请广大客户谅解及支持!(特别提示:商城不提供任何方式接带服务,需上贴片机的客户需自行接带)
</view>
<view class="section"><rich-text :nodes="noticeData[0].notice_content"></rich-text></view>
<button class="share row rowCenter verCenter" open-type="share">
<text class="iconfont icon-jinggao1"></text>
<text class="t1">微信好友</text>
......@@ -20,18 +16,35 @@
</template>
<script>
import { API } from '@/util/api.js';
export default {
data() {
return {};
return {
id: '',
noticeData: ''
};
},
onLoad(options) {
this.id = options.id;
},
onShow() {
this.getData();
},
onLoad(options) {},
onShareTimeline(res) {
onShareAppMessage(res) {
return {
title: '',
imageUrl: ''
title: '猎芯供应链商务系统'
};
},
methods: {}
methods: {
getData() {
this.request(API.GetNotice, 'GET', { limit: 2, notice_type: 1, id: this.id }, true).then(res => {
if (res.err_code === 0) {
this.noticeData = res.data.data;
}
});
}
}
};
</script>
......
......@@ -52,7 +52,7 @@ export default {
uni.setStorageSync('openid', data.data.openid);
uni.setStorageSync('session_key', data.data.session_key);
uni.navigateTo({
url: '/pages/mine/authPhone'
url: '/pages/mine/login'
});
} else {
uni.showToast({
......
......@@ -27,16 +27,14 @@ export default {
onShareTimeline(res) {},
methods: {
decryptPhoneNumber(e) {
let openid = uni.getStorageSync('openid');
let session_key = uni.getStorageSync('session_key');
console.log(e);
this.request(API.BindWechat, 'POST', { encryptedData: e.detail.encryptedData, iv: e.detail.iv, openid: openid, session_key: session_key }, true).then(res => {
if (res.err_code === 0) {
uni.navigateTo({
url: '/pages/mine/login'
});
}
});
if (e.detail.errMsg == 'getPhoneNumber:ok') {
uni.setStorageSync('encryptedData', e.detail.encryptedData);
uni.setStorageSync('iv', e.detail.iv);
uni.navigateTo({
url: '/pages/mine/login'
});
}
}
}
};
......
......@@ -55,8 +55,6 @@ export default {
let openid = uni.getStorageSync('openid');
let session_key = uni.getStorageSync('session_key');
let encryptedData = uni.getStorageSync('encryptedData');
let iv = uni.getStorageSync('iv');
this.request(
API.Login,
'POST',
......@@ -64,9 +62,7 @@ export default {
account: this.account,
pwd: this.pwd,
openid: openid,
session_key: session_key,
encryptedData: encryptedData,
iv: iv
session_key: session_key
},
true
).then(res => {
......
......@@ -76,7 +76,7 @@
<text class="box1 row verCenter tl">{{ item.goods_type }}</text>
<text class="box2 row verCenter tl">{{ item.order_result }}</text>
<text class="box2 row verCenter tl color">{{ item.store_result }}</text>
<text class="box2 row rowCenter verCenter color" @click="open(index)">{{ item.customer_result }}</text>
<text class="box2 row rowCenter verCenter color">{{ item.customer_result }}</text>
</view>
</template>
<template v-else>
......@@ -85,7 +85,7 @@
<text class="box1 row verCenter tl">{{ item.goods_type }}</text>
<text class="box2 row verCenter tl">{{ item.order_result }}</text>
<text class="box2 row verCenter tl color">{{ item.store_result }}</text>
<text class="box2 row rowCenter verCenter color" @click="open(index)">{{ item.customer_result }}</text>
<text class="box2 row rowCenter verCenter color">{{ item.customer_result }}</text>
</view>
</template>
</template>
......@@ -102,28 +102,20 @@
<view class="feedback">
<text class="tt row verCenter">客户处理结果</text>
<view class="list">
<view class="box row verCenter curr" v-if="detail.ask_customer_confirm_feedback == '按照来货数据'">
<view class="box row verCenter curr" v-if="detail.ask_customer_confirm_feedback == '按照修改后的处理'">
<text class="default"></text>
<text class="iconfont icon-a-jinggao3"></text>
<view class="text column">
<text class="t1">A.按照实际来货数量报关</text>
<text class="t1">A.按照修改后的处理</text>
<text class="t2">处理方式快</text>
</view>
</view>
<view class="box row verCenter curr" v-if="detail.ask_customer_confirm_feedback == '先到先报'">
<text class="default"></text>
<text class="iconfont icon-a-jinggao3"></text>
<view class="text column">
<text class="t1">B.先到先报</text>
<text class="t2">货物需求紧急时推荐</text>
</view>
</view>
</view>
<view class="box row verCenter curr" v-if="detail.ask_customer_confirm_feedback == '人工处理'">
<text class="default"></text>
<text class="iconfont icon-a-jinggao3"></text>
<view class="text column">
<text class="t1">C.商务人工处理</text>
<text class="t2">以上处理方式均无法满足,请选择人工</text>
<text class="t1">B.商务人工处理</text>
<text class="t2">货物需求紧急时推荐</text>
</view>
</view>
</view>
......
......@@ -106,7 +106,7 @@
<text class="default"></text>
<text class="iconfont icon-a-jinggao3"></text>
<view class="text column">
<text class="t1">A.按照实际来货数量报关</text>
<text class="t1">A.按照修改后的处理</text>
<text class="t2">处理方式快</text>
</view>
</view>
......@@ -114,18 +114,10 @@
<text class="default"></text>
<text class="iconfont icon-a-jinggao3"></text>
<view class="text column">
<text class="t1">B.先到先报</text>
<text class="t1">B.商务人工处理</text>
<text class="t2">货物需求紧急时推荐</text>
</view>
</view>
<view class="box row verCenter" :class="{ curr: currentIndex == 2 }" @click="changeTab(2)">
<text class="default"></text>
<text class="iconfont icon-a-jinggao3"></text>
<view class="text column">
<text class="t1">C.商务人工处理</text>
<text class="t2">以上处理方式均无法满足,请选择人工</text>
</view>
</view>
</view>
<text class="remark-title">客户备注信息:</text>
<view class="text-area"><textarea placeholder="此处提交的备注信息,仓库和商务均可看到(选填)" v-model="ask_customer_confirm_remark"></textarea></view>
......@@ -219,7 +211,7 @@ export default {
order_goods: [],
order_goods_index: 0,
customer_result_text: '',
ask_customer_confirm_feedback: '按照来货数据'
ask_customer_confirm_feedback: '按照修改后的处理'
};
},
onLoad(options) {
......@@ -287,10 +279,8 @@ export default {
changeTab(index) {
this.currentIndex = index;
if (index == 0) {
this.ask_customer_confirm_feedback = '按照来货数据';
this.ask_customer_confirm_feedback = '按照修改后的处理';
} else if (index == 1) {
this.ask_customer_confirm_feedback = '先到先报';
} else if (index == 2) {
this.ask_customer_confirm_feedback = '人工处理';
this.toChat();
}
......@@ -307,7 +297,7 @@ export default {
});
},
open(index) {
this.current = 1;
this.current = 0;
this.order_goods_index = index;
this.ask_data = this.detail.order_goods[index];
this.$refs.popup.open('bottom');
......@@ -360,7 +350,7 @@ export default {
).then(res => {
if (res.err_code === 0) {
uni.navigateTo({
url: '/pages/question/result'
url: '/pages/question/result?ask_customer_problem_list_id=' + self.ask_customer_problem_list_id
});
} else {
uni.showToast({
......
......@@ -10,59 +10,69 @@
<view class="tab row">
<view class="box row" @click="changeTab(index)" :class="{ curr: index == currentIndex }" :key="index" v-for="(item, index) in textArr">
<text>{{ item }}</text>
<text class="num">({{ total }})</text>
<text class="num" v-if="index == 0">({{ total }})</text>
</view>
</view>
<view class="section">
<view class="list column">
<template v-if="list.length > 0">
<navigator class="box row bothSide" :class="{ curr: item.is_urgent != '' }" :url="item.ask_customer_status == 2 ? '/pages/question/detail?id=' + item.ask_customer_problem_list_id: '/pages/question/handle?id=' + item.ask_customer_problem_list_id" hover-class="none" v-for="item in list">
<view class="base-info column">
<view class="row verCenter mb20">
<view class="t1">{{ item.erp_order_sn }}</view>
<view class="button-text row rowCenter verCenter">{{ item.ask_customer_exception_id_cn }}</view>
</view>
<view class="row verCenter">
<text class="iconfont icon-riqi"></text>
<text class="t2">发起时间:</text>
<text class="t3">{{ item.create_time_cn }}</text>
</view>
</view>
<view class="time-info">
<!-- 紧急情况区分 -->
<template v-if="item.is_urgent != ''">
<view class="status0 row verCenter">
<text class="iconfont icon-jinggao"></text>
<span>紧急</span>
</view>
</template>
<template v-else>
<view class="status2">{{ item.handle_type_cn }}</view>
</template>
<view class="time">
<text class="t1">已耗时:</text>
<text class="t2">{{ item.ask_time }}</text>
</view>
</view>
</navigator>
</template>
<template v-else>
<!-- 登录无数据-->
<view class="no-data column verCenter rowCenter" v-if="is_login">
<text class="iconfont icon-a-jinggao1"></text>
<text class="text">查找不到相关信息</text>
</view>
<!-- 未登录状态 -->
<view class="no-data column verCenter rowCenter" v-else>
<text class="iconfont icon-a-jinggao1"></text>
<view class="row verCenter">
<text class="text">查找不到相关信息,请</text>
<navigator url="/pages/mine/auth" hover-class="none" class="hove">登录</navigator>
<text class="text">后查看</text>
</view>
</view>
</template>
</view>
<view class="list column">
<template v-if="list.length > 0">
<navigator
class="box row bothSide"
:class="{ curr: item.is_urgent == '紧急' }"
:url="
item.ask_customer_status == 2
? '/pages/question/detail?id=' + item.ask_customer_problem_list_id
: '/pages/question/handle?id=' + item.ask_customer_problem_list_id
"
hover-class="none"
v-for="item in list"
>
<view class="base-info column">
<view class="row verCenter mb20">
<view class="t1">{{ item.erp_order_sn }}</view>
<view class="button-text row rowCenter verCenter">{{ item.ask_customer_exception_id_cn }}</view>
</view>
<view class="row verCenter">
<text class="iconfont icon-riqi"></text>
<text class="t2">发起时间:</text>
<text class="t3">{{ item.create_time_cn }}</text>
</view>
</view>
<view class="time-info">
<!-- 紧急情况区分 -->
<template v-if="item.is_urgent == '紧急'">
<view class="status0 row verCenter">
<text class="iconfont icon-jinggao"></text>
<span>{{item.is_urgent}}</span>
</view>
</template>
<template v-else>
<view class="status2">{{ item.handle_type_cn }}</view>
</template>
<view class="time">
<text class="t1">已耗时:</text>
<text class="t2">{{ item.ask_time }}</text>
</view>
</view>
</navigator>
</template>
<template v-else>
<!-- 登录无数据-->
<view class="no-data column verCenter rowCenter" v-if="is_login">
<text class="iconfont icon-a-jinggao1"></text>
<text class="text">查找不到相关信息</text>
</view>
<!-- 未登录状态 -->
<view class="no-data column verCenter rowCenter" v-else>
<text class="iconfont icon-a-jinggao1"></text>
<view class="row verCenter">
<text class="text">查找不到相关信息,请</text>
<navigator url="/pages/mine/auth" hover-class="none" class="hove">登录</navigator>
<text class="text">后查看</text>
</view>
</view>
</template>
</view>
<uni-load-more :status="more" v-if="list.length >= limit"></uni-load-more>
</view>
</view>
......@@ -99,8 +109,13 @@ export default {
},
methods: {
inputChange() {
this.list = [];
this.page = 1;
this.currentIndex = 0;
this.getAskCustomerProblemList();
setTimeout(()=>{
this.changeTab(0);
},200)
},
getAskCustomerProblemList() {
this.request(
......
......@@ -4,7 +4,7 @@
<text class="t1">回复确认成功</text>
<text class="t2">您可以在问题列表中查看或联系商务人员</text>
<view class="btn column rowCenter verCenter">
<view class="btn-1 row rowCenter verCenter">查看详情</view>
<navigator :url="'/pages/question/detail?id=' + ask_customer_problem_list_id" hover-class="none" class="btn-1 row rowCenter verCenter">查看详情</navigator>
<navigator url="/pages/question/list" open-type="switchTab" class="btn-2 row rowCenter verCenter" hover-class="none">返回订单列表</navigator>
</view>
</view>
......@@ -13,9 +13,13 @@
<script>
export default {
data() {
return {};
return {
ask_customer_problem_list_id: ''
};
},
onLoad(options) {
this.ask_customer_problem_list_id = options.ask_customer_problem_list_id;
},
onLoad(options) {},
onShareTimeline(res) {
return {
title: '',
......
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 sign in to comment