diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index 62dc7edc329b70445788d3225975f8c115063011..3ce98073648e855b7bc96fb86561f82108ea97bb 100755
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -95,7 +95,14 @@ class User extends Common
$result = (new \base\AlipayAuth())->GetAuthCode(MyC('common_app_mini_alipay_appid'), $this->data_post['authcode']);
if($result['status'] == 0)
{
- return DataReturn('授权登录成功', 0, $result['data']['user_id']);
+ // 先从数据库获取用户信息
+ $user = UserService::AppUserInfoHandle(null, 'alipay_openid', $result['data']['user_id']);
+ if(empty($user))
+ {
+ return DataReturn('授权登录成功', 0, ['is_alipay_user_exist'=>0, 'openid'=>$result['data']['user_id']]);
+ }
+ $user['is_alipay_user_exist'] = 1;
+ return DataReturn('授权成功', 0, $user);
}
return DataReturn($result['msg'], -100);
}
diff --git a/application/service/UeditorService.php b/application/service/UeditorService.php
index d9c06a026d8e4d38bdd985d7e485b9c691356a2b..36fede9aa7c1b1c0b21f3866939946ed07db16c9 100644
--- a/application/service/UeditorService.php
+++ b/application/service/UeditorService.php
@@ -98,11 +98,11 @@ class UeditorService
return DataReturn('callback参数不合法', -1);
}
}
- if(self::$current_result['state'] == 'SUCCESS')
+ if(isset(self::$current_result['state']) && self::$current_result['state'] != 'SUCCESS')
{
- return DataReturn('操作成功', 0, self::$current_result);
+ return DataReturn(self::$current_result['state'], -1);
}
- return DataReturn(self::$current_result['state'], -1);
+ return DataReturn('操作成功', 0, self::$current_result);
}
/**
diff --git a/public/appmini/old/alipay/app.js b/public/appmini/old/alipay/app.js
index 105acc6eeb5b851ab8cd10dfdb609f9aececee21..eba27bd88735bdea3784b6a584e4bdcf7bbbd4ff 100644
--- a/public/appmini/old/alipay/app.js
+++ b/public/appmini/old/alipay/app.js
@@ -63,8 +63,8 @@ App({
// 请求地址
request_url: "{{request_url}}",
- // request_url: 'http://tp5-dev.com/',
- // request_url: 'http://test.shopxo.net/',
+ request_url: 'http://tp5-dev.com/',
+ request_url: 'http://test.shopxo.net/',
// 基础信息
application_title: "{{application_title}}",
@@ -197,7 +197,7 @@ App({
var user = this.get_user_cache_info();
if (user == false) {
// 唤醒用户授权
- this.user_login();
+ this.user_login(object, method);
return false;
} else {
@@ -218,8 +218,10 @@ App({
/**
* 用户授权
+ * object 回调操作对象
+ * method 回调操作对象的函数
*/
- user_login() {
+ user_login(object, method) {
var openid = my.getStorageSync({key: this.data.cache_user_login_key});
if ((openid.data || null) == null)
{
@@ -241,12 +243,32 @@ App({
success: res => {
my.hideLoading();
if (res.data.code == 0) {
- my.setStorageSync({
- key: $this.data.cache_user_login_key,
- data: res.data.data
- });
-
- $this.login_to_auth();
+ var data = res.data.data;
+ if((data.is_alipay_user_exist || 0) == 1)
+ {
+ my.setStorage({
+ key: $this.data.cache_user_info_key,
+ data: data,
+ success: (res) => {
+ if (typeof object === 'object' && (method || null) != null) {
+ object[method]();
+ }
+ },
+ fail: () => {
+ my.showToast({
+ type: "fail",
+ content: "用户信息缓存失败",
+ duration: 3000
+ });
+ }
+ });
+ } else {
+ my.setStorageSync({
+ key: $this.data.cache_user_login_key,
+ data: res.data.data.openid
+ });
+ $this.login_to_auth();
+ }
} else {
my.showToast({
type: "fail",
@@ -309,7 +331,7 @@ App({
var openid = my.getStorageSync({key: this.data.cache_user_login_key});
if ((openid.data || null) == null)
{
- this.user_login();
+ this.user_login(object, method);
} else {
this.get_user_login_info(object, method, openid.data, auth_data);
}
diff --git a/public/appmini/old/alipay/app.json b/public/appmini/old/alipay/app.json
index 140b2ec2911bdffcc54aa36e1ffd6f9c802dcc1a..8bda1bea020618c6be0aedc02aa88020374554ec 100644
--- a/public/appmini/old/alipay/app.json
+++ b/public/appmini/old/alipay/app.json
@@ -22,10 +22,12 @@
"pages/answer-form/answer-form",
"pages/message/message",
"pages/user-integral/user-integral",
- "pages/user-goods-browse/user-goods-browse"
+ "pages/user-goods-browse/user-goods-browse",
+ "pages/user-orderaftersale/user-orderaftersale",
+ "pages/user-orderaftersale-detail/user-orderaftersale-detail"
],
"window": {
- "defaultTitle": "{{application_title}}",
+ "defaultTitle": "test",
"titleBarColor": "#d2364c"
},
"tabBar": {
diff --git a/public/appmini/old/alipay/pages/cart/cart.js b/public/appmini/old/alipay/pages/cart/cart.js
index b4c9106a475db4e9f14811e50a9cedeedf92f8ed..1f8b6971bdca6406eb10ac7416373e58ace2516e 100644
--- a/public/appmini/old/alipay/pages/cart/cart.js
+++ b/public/appmini/old/alipay/pages/cart/cart.js
@@ -27,16 +27,16 @@ Page({
confirmButtonText: '确认',
cancelButtonText: '暂不',
success: (result) => {
+ my.stopPullDownRefresh();
if (result.confirm) {
my.navigateTo({
url: "/pages/login/login?event_callback=init"
});
} else {
- my.stopPullDownRefresh();
this.setData({
data_list_loding_status: 0,
data_bottom_line_status: false,
- data_list_loding_msg: '请先' + msg,
+ data_list_loding_msg: '请先绑定手机号码',
});
}
},
diff --git a/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.acss b/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.acss
new file mode 100644
index 0000000000000000000000000000000000000000..bf9a2510bf97625601fae2ef6494dffb7c5869c1
--- /dev/null
+++ b/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.acss
@@ -0,0 +1,150 @@
+/**
+ * 商品
+ */
+.goods-base {
+ min-height: 160rpx;
+ margin-left: 180rpx;
+}
+.goods .goods-item:not(:last-child) {
+ border-bottom: 1px dashed #efefef;
+}
+.goods-item {
+ padding: 20rpx 10rpx;
+}
+.goods-title, .goods-attribute {
+ margin-bottom: 10rpx;
+}
+.goods-image {
+ width: 160rpx;
+ height: 160rpx;
+ margin-right: 20rpx;
+}
+.goods-price {
+ position: relative;
+}
+.buy-number {
+ position: absolute;
+ right: 0;
+ bottom: 0;
+}
+
+/**
+ * 类型选择
+ */
+ .choose-type {
+ padding: 30rpx 10rpx;
+ }
+.choose-type .choose-item {
+ width: 44%;
+ border: 1px solid #eee;
+ padding: 15rpx;
+ -webkit-transition: border-color .2s ease-in;
+ -moz-transition: border-color .2s ease-in;
+ -ms-transition: border-color .2s ease-in;
+ -o-transition: border-color .2s ease-in;
+ transition: border-color .2s ease-in;
+}
+.choose-type .choose-name {
+ font-weight: bold;
+ margin-bottom: 5rpx;
+}
+.choose-type .choose-item-active {
+ border: 1px solid #d2364c;
+ box-shadow: 0px 0 0px 1px #d2364c;
+}
+
+/*
+ * 售后信息
+ */
+.detail {
+ padding: 20rpx 10rpx;
+}
+.detail .msg-tips {
+ padding: 10rpx;
+ border-radius: 0;
+ background: #f1faff;
+ border: 1px solid #e2f5ff;
+ color: #1490d2;
+}
+.detail .msg-tips-warning {
+ background-color: #fff7f1;
+ border-color: #fff0e4;
+ color: #f37b1d;
+}
+.detail .msg-tips-success {
+ background-color: #eef7ea;
+ border-color: #e3f3d6;
+ color: #468847;
+}
+.detail .msg-tips-danger {
+ background-color: #fff1f0;
+ border-color: #ffe4e3;
+ color: #dd514c;
+}
+.detail .msg-tips .msg-a {
+ color: #d2354c;
+ margin-left: 10rpx;
+}
+.detail .msg-tips-danger .msg-a {
+ color: #136ed9;
+}
+
+/*
+ * 退货地址
+ */
+.return-address .address-value {
+ color: #0e90d2;
+}
+.detail .msg-tips button {
+ border-radius: 3px;
+ height: 60rpx;
+ line-height: 60rpx;
+ padding: 0 30rpx;
+ font-size: 24rpx;
+ margin-top: 10rpx;
+}
+
+/*
+ * 面板信息
+ */
+.panel-item {
+ border: 1px solid #eee;
+}
+.panel-item .panel-title {
+ background: #eee;
+ font-weight: bold;
+ padding: 15rpx;
+}
+.panel-item .panel-content .item {
+ padding: 20rpx 0;
+}
+.panel-item .panel-content .item:last-child {
+ border: 0;
+}
+.panel-item .panel-content .item .title {
+ width: 25%;
+ padding-left: 20rpx;
+}
+.panel-item .panel-content .item .content {
+ width: calc(75% - 50rpx);
+ padding-left: 20rpx;
+ min-height: 46rpx;
+}
+.panel-item .panel-content .item view {
+ line-height: 46rpx;
+}
+
+/*
+ * 面板图片
+ */
+.panel-item .voucher-data {
+ padding: 10px 0;
+}
+.panel-item .voucher-data .item {
+ padding: 10rpx;
+}
+.panel-item .voucher-data .item image {
+ width: 200rpx;
+ height: 200rpx;
+ display: block;
+}
\ No newline at end of file
diff --git a/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.axml b/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.axml
new file mode 100644
index 0000000000000000000000000000000000000000..7a42a81aec58516d31bb152f879616c103e6b85e
--- /dev/null
+++ b/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.axml
@@ -0,0 +1,172 @@
+
+
+
+
+
+
+
+ {{order_data.items.title}}
+
+
+ {{spec.type}}:{{spec.value}}
+
+
+
+
+ ¥{{order_data.items.price}}
+ ¥{{order_data.items.original_price}}
+ x{{order_data.items.buy_number}}
+
+
+
+
+
+
+
+
+
+ {{new_aftersale_data.tips_msg}}
+ 详情查看 >>
+
+
+
+
+
+
+
+
+ 退货地址:
+ {{return_goods_address}}
+
+
+
+
+
+ {{new_aftersale_data.tips_msg}}
+ 详情查看 >>
+
+
+
+
+
+
+ 申请信息
+
+
+ {{item.name}}
+ {{new_aftersale_data[item.field] || ''}}
+
+
+
+
+
+
+ 快递信息
+
+
+ {{item.name}}
+ {{new_aftersale_data[item.field] || ''}}
+
+
+
+
+
+
+ 凭证
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+ {{item.desc}}
+
+
+
+
+
+
+
+ 退款原因必选
+
+
+ {{form_reason_index == -1 ? '请选择原因' : reason_data_list[form_reason_index]}}
+
+
+
+
+
+ 商品件数不能大于{{returned_data.returned_quantity}}数量
+
+
+
+
+ 退款金额不能大于{{returned_data.refund_price}}元
+
+
+
+
+ 退款说明必填
+
+
+
+
+ 上传凭证最多上传3张图片
+
+
+
+ x
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.js b/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
new file mode 100644
index 0000000000000000000000000000000000000000..3091957d2e75f5711bc0a7ece86e72fe3bd7e7e4
--- /dev/null
+++ b/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
@@ -0,0 +1,468 @@
+const app = getApp();
+Page({
+ data: {
+ params: null,
+ data_list_loding_status: 1,
+ data_list_loding_msg: '',
+ data_bottom_line_status: false,
+ popup_delivery_status: false,
+
+ // 接口数据
+ order_data: null,
+ new_aftersale_data: null,
+ step_data: null,
+ returned_data: null,
+ return_only_money_reason: [],
+ return_money_goods_reason: [],
+ aftersale_type_list: [],
+ reason_data_list: [],
+ return_goods_address: null,
+
+ // 售后基础信息
+ panel_base_data_list: [
+ {
+ name: '退款类型',
+ field: 'type_text',
+ },
+ {
+ name: '当前状态',
+ field: 'status_text',
+ },
+ {
+ name: '申请原因',
+ field: 'reason',
+ },
+ {
+ name: '退货数量',
+ field: 'number',
+ },
+ {
+ name: '退款金额',
+ field: 'price',
+ },
+ {
+ name: '退款说明',
+ field: 'msg',
+ },
+ {
+ name: '退款方式',
+ field: 'refundment_text',
+ },
+ {
+ name: '拒绝原因',
+ field: 'refuse_reason',
+ },
+ {
+ name: '申请时间',
+ field: 'apply_time_time',
+ },
+ {
+ name: '确认时间',
+ field: 'confirm_time_time',
+ },
+ {
+ name: '退货时间',
+ field: 'delivery_time_time',
+ },
+ {
+ name: '审核时间',
+ field: 'audit_time_time',
+ },
+ {
+ name: '取消时间',
+ field: 'cancel_time_time',
+ },
+ {
+ name: '添加时间',
+ field: 'add_time_time',
+ },
+ {
+ name: '更新时间',
+ field: 'upd_time_time',
+ }
+ ],
+
+ // 快递信息
+ panel_express_data_list: [
+ {
+ name: '快递名称',
+ field: 'express_name',
+ },
+ {
+ name: '快递单号',
+ field: 'express_number',
+ },
+ {
+ name: '退货时间',
+ field: 'delivery_time_time',
+ }
+ ],
+
+ // 表单数据
+ form_button_disabled: false,
+ form_type: -1,
+ form_reason_index: -1,
+ form_price: '',
+ form_msg: '',
+ form_number: 0,
+ form_images_list: [],
+ form_express_name: '',
+ form_express_number: '',
+ },
+
+ onLoad(params) {
+ this.setData({
+ params: params,
+ popup_delivery_status: ((params.is_delivery_popup || 0) == 1),
+ });
+ this.init();
+ },
+
+ onShow() {
+ my.setNavigationBar({ title: app.data.common_pages_title.user_orderaftersale_detail });
+ },
+
+ init() {
+ var self = this;
+ my.showLoading({content: "加载中..." });
+ this.setData({
+ data_list_loding_status: 1
+ });
+
+ my.request({
+ url: app.get_request_url("aftersale", "orderaftersale"),
+ method: "POST",
+ data: {
+ oid: this.data.params.oid,
+ did: this.data.params.did
+ },
+ dataType: "json",
+ success: res => {
+ my.hideLoading();
+ my.stopPullDownRefresh();
+ if (res.data.code == 0) {
+ var data = res.data.data;
+ self.setData({
+ data_list_loding_status: 3,
+ data_bottom_line_status: true,
+ data_list_loding_msg: '',
+
+ order_data: data.order_data || null,
+ new_aftersale_data: ((data.new_aftersale_data || null) == null || data.new_aftersale_data.length <= 0) ? null : data.new_aftersale_data,
+ step_data: data.step_data || null,
+ returned_data: data.returned_data || null,
+ return_only_money_reason: data.return_only_money_reason || [],
+ return_money_goods_reason: data.return_money_goods_reason || [],
+ aftersale_type_list: data.aftersale_type_list || [],
+ return_goods_address: data.return_goods_address || null,
+
+ form_price: (data.returned_data || null != null) ? data.returned_data.refund_price : 0,
+ });
+ } else {
+ self.setData({
+ data_list_loding_status: 0,
+ data_bottom_line_status: false,
+ data_list_loding_msg: res.data.msg,
+ });
+ app.showToast(res.data.msg);
+ }
+ },
+ fail: () => {
+ my.hideLoading();
+ my.stopPullDownRefresh();
+ self.setData({
+ data_list_loding_status: 2,
+ data_bottom_line_status: false,
+ data_list_loding_msg: '服务器请求出错',
+ });
+
+ app.showToast("服务器请求出错");
+ }
+ });
+ },
+
+ // 类型选择
+ form_type_event(e) {
+ var value = e.target.dataset.value;
+ this.setData({
+ form_type: value,
+ form_reason_index: (this.data.form_type == value) ? this.data.form_reason_index : -1,
+ reason_data_list: (value == 0) ? this.data.return_only_money_reason : this.data.return_money_goods_reason,
+ form_number: (value == 0) ? 0 : this.data.returned_data.returned_quantity,
+ });
+ },
+
+ // 原因选择
+ form_reason_event(e) {
+ this.setData({
+ form_reason_index: e.detail.value
+ });
+ },
+
+ // 商品件数
+ form_number_event(e) {
+ this.setData({
+ form_number: e.detail.value
+ });
+ },
+
+ // 退款金额
+ form_price_event(e) {
+ this.setData({
+ form_price: e.detail.value
+ });
+ },
+
+ // 退款说明
+ form_msg_event(e) {
+ this.setData({
+ form_msg: e.detail.value
+ });
+ },
+
+ // 快递名称
+ form_express_name_event(e) {
+ this.setData({
+ form_express_name: e.detail.value
+ });
+ },
+
+ // 快递单号
+ form_express_number_event(e) {
+ this.setData({
+ form_express_number: e.detail.value
+ });
+ },
+
+ // 上传图片预览
+ upload_show_event(e) {
+ my.previewImage({
+ current: this.data.form_images_list[e.target.dataset.index],
+ urls: this.data.form_images_list,
+ });
+ },
+
+ // 图片删除
+ upload_delete_event(e) {
+ var self = this;
+ my.confirm({
+ title: '温馨提示',
+ content: '删除后不可恢复、继续吗?',
+ success(res) {
+ if (res.confirm) {
+ var list = self.data.form_images_list;
+ list.splice(e.target.dataset.index, 1);
+ self.setData({
+ form_images_list: list,
+ });
+ }
+ }
+ });
+ },
+
+ // 文件上传
+ file_upload_event(e) {
+ var self = this;
+ my.chooseImage({
+ count: 3,
+ success(res) {
+ var success = 0;
+ var fail = 0;
+ var length = res.tempFilePaths.length;
+ var count = 0;
+ self.upload_one_by_one(res.tempFilePaths, success, fail, count, length);
+ }
+ });
+ },
+
+ // 采用递归的方式上传多张
+ upload_one_by_one(img_paths, success, fail, count, length) {
+ var self = this;
+ if (self.data.form_images_list.length < 3) {
+ my.uploadFile({
+ url: app.get_request_url("index", "ueditor"),
+ filePath: img_paths[count],
+ fileName: 'upfile',
+ fileType: 'image',
+ formData: {
+ action: 'uploadimage',
+ },
+ success: function (res) {
+ success++;
+ if (res.statusCode == 200) {
+ var data = (typeof (res.data) == 'object') ? res.data : JSON.parse(res.data);
+ if (data.code == 0 && (data.data.url || null) != null) {
+ var list = self.data.form_images_list;
+ list.push(data.data.url);
+ self.setData({ form_images_list: list });
+ } else {
+ app.showToast(data.msg);
+ }
+ }
+ },
+ fail: function (e) {
+ fail++;
+ },
+ complete: function (e) {
+ count++; // 下一张
+ if (count >= length) {
+ // 上传完毕,作一下提示
+ //app.showToast('上传成功' + success +'张', 'success');
+ } else {
+ // 递归调用,上传下一张
+ self.upload_one_by_one(img_paths, success, fail, count, length);
+ }
+ }
+ });
+ }
+ },
+
+ // 售后表单提交
+ form_submit_event(e) {
+ // 表单数据
+ var form_data = {
+ order_id: this.data.params.oid,
+ order_detail_id: this.data.params.did,
+ type: this.data.form_type,
+ reason: this.data.reason_data_list[this.data.form_reason_index],
+ number: (this.data.form_type == 0) ? 0 : this.data.form_number,
+ price: this.data.form_price,
+ msg: this.data.form_msg,
+ images: (this.data.form_images_list.length > 0) ? JSON.stringify(this.data.form_images_list) : '',
+ }
+
+ // 防止金额大于计算的金额
+ if (form_data['price'] > this.data.returned_data['refund_price'])
+ {
+ form_data['price'] = this.data.returned_data['refund_price'];
+ }
+
+ // 防止数量大于计算的数量
+ if (form_data['number'] > this.data.returned_data['returned_quantity']) {
+ form_data['number'] = this.data.returned_data['returned_quantity'];
+ }
+
+ // 数据校验
+ var validation = [
+ { fields: "type", msg: "请选择操作类型", is_can_zero: 1 },
+ { fields: "reason", msg: "请选择原因" },
+ { fields: "msg", msg: "请填写退款说明" }
+ ];
+ if (form_data['type'] == 1)
+ {
+ validation.push({ fields: "number", msg: "请选择退货数量" });
+ }
+
+ // 校验参数并提交
+ if (app.fields_check(form_data, validation)) {
+ var self = this;
+ my.showLoading({content: "处理中..." });
+ self.setData({ form_button_disabled: true });
+ my.request({
+ url: app.get_request_url("create", "orderaftersale"),
+ method: "POST",
+ data: form_data,
+ dataType: "json",
+ header: { 'content-type': 'application/x-www-form-urlencoded' },
+ success: res => {
+ my.hideLoading();
+ if (res.data.code == 0) {
+ app.showToast(res.data.msg, "success");
+ setTimeout(function () {
+ self.setData({ form_button_disabled: false });
+ self.init();
+ }, 1000);
+ } else {
+ self.setData({ form_button_disabled: false});
+ app.showToast(res.data.msg);
+ }
+ },
+ fail: () => {
+ my.hideLoading();
+ self.setData({ form_button_disabled: false });
+ app.showToast("服务器请求出错");
+ }
+ });
+ }
+ },
+
+ // 退货开启弹层
+ delivery_submit_event(e) {
+ this.setData({ popup_delivery_status: true });
+ },
+
+ // 退货弹层关闭
+ popup_delivery_close_event(e) {
+ this.setData({ popup_delivery_status: false });
+ },
+
+ // 退货表单
+ form_delivery_submit_event(e) {
+ // 表单数据
+ var form_data = {
+ id: this.data.new_aftersale_data.id,
+ express_name: this.data.form_express_name,
+ express_number: this.data.form_express_number,
+ }
+
+ // 数据校验
+ var validation = [
+ { fields: "express_name", msg: "请填写快递名称" },
+ { fields: "express_number", msg: "请填写快递单号" },
+ ];
+
+ // 校验参数并提交
+ if (app.fields_check(form_data, validation)) {
+ var self = this;
+ my.showLoading({content: "处理中..." });
+ self.setData({ form_button_disabled: true });
+ my.request({
+ url: app.get_request_url("delivery", "orderaftersale"),
+ method: "POST",
+ data: form_data,
+ dataType: "json",
+ header: { 'content-type': 'application/x-www-form-urlencoded' },
+ success: res => {
+ my.hideLoading();
+ self.setData({ popup_delivery_status: false});
+ if (res.data.code == 0) {
+ app.showToast(res.data.msg, "success");
+ setTimeout(function () {
+ self.setData({ form_button_disabled: false });
+ self.init();
+ }, 1000);
+ } else {
+ self.setData({ form_button_disabled: false });
+ app.showToast(res.data.msg);
+ }
+ },
+ fail: () => {
+ my.hideLoading();
+ self.setData({ form_button_disabled: false });
+ app.showToast("服务器请求出错");
+ }
+ });
+ }
+ },
+
+ // 凭证图片预览
+ images_view_event(e) {
+ my.previewImage({
+ current: this.data.new_aftersale_data.images[e.target.dataset.index],
+ urls: this.data.new_aftersale_data.images,
+ });
+ },
+
+ // 查看售后数据
+ show_aftersale_event(e) {
+ my.navigateTo({
+ url: "/pages/user-orderaftersale/user-orderaftersale?keywords=" + this.data.new_aftersale_data.order_no
+ });
+ },
+
+ // 下拉刷新
+ onPullDownRefresh() {
+ this.init();
+ },
+
+});
diff --git a/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.json b/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.json
new file mode 100644
index 0000000000000000000000000000000000000000..55e2d05affa6488b5d2b4ef24f1d955cb4fcef8c
--- /dev/null
+++ b/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.json
@@ -0,0 +1,6 @@
+{
+ "pullRefresh": true,
+ "usingComponents": {
+ "popup": "mini-antui/es/popup/index"
+ }
+}
\ No newline at end of file
diff --git a/public/appmini/old/alipay/pages/user-orderaftersale/user-orderaftersale.acss b/public/appmini/old/alipay/pages/user-orderaftersale/user-orderaftersale.acss
new file mode 100644
index 0000000000000000000000000000000000000000..d56cc55d71417af9a85a64d8e626fd7276c16d99
--- /dev/null
+++ b/public/appmini/old/alipay/pages/user-orderaftersale/user-orderaftersale.acss
@@ -0,0 +1,65 @@
+/*
+ * 导航
+ */
+.nav {
+ background: #eee;
+ height: 80rpx;
+ line-height: 80rpx;
+}
+.nav .item {
+ width: 14.28%;
+}
+
+/*
+ * 列表
+ */
+.scroll-box{
+ height: calc(100vh - 80rpx);
+}
+.goods-base {
+ min-height: 160rpx;
+ margin-left: 180rpx;
+ position: relative;
+}
+.goods-title {
+ line-height: 36rpx;
+}
+.list-item .goods-item:not(:last-child) {
+ border-bottom: 1px dashed #efefef;
+}
+.goods-item {
+ padding: 20rpx 10rpx;
+}
+.goods-title, .goods-spec {
+ margin-bottom: 10rpx;
+}
+.goods-image {
+ width: 160rpx;
+ height: 160rpx;
+ margin-right: 20rpx;
+}
+.goods-price {
+ position: relative;
+ margin-top: 10rpx;
+}
+.buy-number {
+ position: absolute;
+ right: 0;
+ bottom: 0;
+}
+.item-base, .item-describe, .item-operation {
+ padding: 20rpx 10rpx 20rpx 10rpx;
+}
+.item-describe .ds {
+ margin: 0 10rpx;
+}
+.submit-cancel {
+ border: 1px solid #f7c3b3;
+ color: #f7c3b3 !important;
+}
+.item-operation button:not(:first-child) {
+ margin-left: 20rpx;
+}
+.item-operation button {
+ padding: 0 35rpx;
+}
\ No newline at end of file
diff --git a/public/appmini/old/alipay/pages/user-orderaftersale/user-orderaftersale.axml b/public/appmini/old/alipay/pages/user-orderaftersale/user-orderaftersale.axml
new file mode 100644
index 0000000000000000000000000000000000000000..0d51780987c4028d1eb60f7ffcc128ef61160557
--- /dev/null
+++ b/public/appmini/old/alipay/pages/user-orderaftersale/user-orderaftersale.axml
@@ -0,0 +1,60 @@
+
+
+
+ {{item.name}}
+ {{item.name}}
+
+
+
+
+
+
+
+
+ {{item.add_time_time}}
+ {{item.status_text}}
+
+
+
+
+
+ {{item.order_data.items.title}}
+
+
+ {{spec.type}}:{{spec.value}}
+
+
+ {{item.order_data.items.orderaftersale_btn_text}}
+
+
+ ¥{{item.order_data.items.price}}
+ ¥{{item.order_data.items.original_price}}
+ x{{item.order_data.items.buy_number}}
+
+
+
+
+ {{item.type_text}}
+ /
+ {{item.reason}}
+ /
+ ¥{{item.price}}
+ x{{item.number}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/public/appmini/old/alipay/pages/user-orderaftersale/user-orderaftersale.js b/public/appmini/old/alipay/pages/user-orderaftersale/user-orderaftersale.js
new file mode 100644
index 0000000000000000000000000000000000000000..2027c2f37afa3aaf8dd6c18088bcad3bae20987a
--- /dev/null
+++ b/public/appmini/old/alipay/pages/user-orderaftersale/user-orderaftersale.js
@@ -0,0 +1,248 @@
+const app = getApp();
+Page({
+ data: {
+ params: null,
+ data_list_loding_status: 1,
+ data_list_loding_msg: '',
+ data_bottom_line_status: false,
+
+ // 接口数据
+ data_list: [],
+ data_page_total: 0,
+ data_page: 1,
+ form_keyword_value: '',
+
+ // 导航
+ // 状态(0待确认, 1待退货, 2待审核, 3已完成, 4已拒绝, 5已取消)
+ nav_status_list: [
+ { name: "全部", value: "-1" },
+ { name: "待确认", value: "0" },
+ { name: "待退货", value: "1" },
+ { name: "待审核", value: "2" },
+ { name: "已完成", value: "3" },
+ { name: "已拒绝", value: "4" },
+ { name: "已取消", value: "5" },
+ ],
+ nav_status_index: 0,
+ },
+
+ onLoad(params) {
+ // 是否指定状态
+ var nav_status_index = 0;
+ if ((params.status || null) != null) {
+ for (var i in this.data.nav_status_list) {
+ if (this.data.nav_status_list[i]['value'] == params.status) {
+ nav_status_index = i;
+ break;
+ }
+ }
+ }
+
+ this.setData({
+ params: params,
+ form_keyword_value: params.keywords || '',
+ nav_status_index: nav_status_index,
+ });
+ this.init();
+ },
+
+ onShow() {
+ my.setNavigationBar({ title: app.data.common_pages_title.user_orderaftersale });
+ },
+
+ init() {
+ var user = app.get_user_info(this, "init");
+ // 用户未绑定用户则转到登录页面
+ if (app.user_is_need_login(user)) {
+ my.redirectTo({
+ url: "/pages/login/login?event_callback=init"
+ });
+ return false;
+ } else {
+ // 获取数据
+ this.get_data_list();
+ }
+ },
+
+ // 获取数据
+ get_data_list(is_mandatory) {
+ // 分页是否还有数据
+ if ((is_mandatory || 0) == 0) {
+ if (this.data.data_bottom_line_status == true) {
+ return false;
+ }
+ }
+
+ // 加载loding
+ my.showLoading({content: "加载中..." });
+ this.setData({
+ data_list_loding_status: 1
+ });
+
+ // 参数
+ var status = ((this.data.nav_status_list[this.data.nav_status_index] || null) == null) ? -1 : this.data.nav_status_list[this.data.nav_status_index]['value'];
+
+ my.request({
+ url: app.get_request_url("index", "orderaftersale"),
+ method: "POST",
+ data: {
+ page: this.data.data_page,
+ keywords: this.data.form_keyword_value || "",
+ status: status,
+ is_more: 1,
+ },
+ dataType: "json",
+ success: res => {
+ my.hideLoading();
+ my.stopPullDownRefresh();
+ if (res.data.code == 0) {
+ if (res.data.data.data.length > 0) {
+ if (this.data.data_page <= 1) {
+ var temp_data_list = res.data.data.data;
+ } else {
+ var temp_data_list = this.data.data_list;
+ var temp_data = res.data.data.data;
+ for (var i in temp_data) {
+ temp_data_list.push(temp_data[i]);
+ }
+ }
+
+ this.setData({
+ data_list: temp_data_list,
+ data_total: res.data.data.total,
+ data_page_total: res.data.data.page_total,
+ data_list_loding_status: 3,
+ data_page: this.data.data_page + 1,
+ });
+
+ // 是否还有数据
+ if (this.data.data_page > 1 && this.data.data_page > this.data.data_page_total) {
+ this.setData({ data_bottom_line_status: true });
+ } else {
+ this.setData({ data_bottom_line_status: false });
+ }
+ } else {
+ this.setData({
+ data_list_loding_status: 0,
+ data_list_loding_msg: '没有相关数据',
+ data_list: [],
+ data_bottom_line_status: false,
+ });
+ }
+ } else {
+ this.setData({
+ data_list_loding_status: 0,
+ data_list_loding_msg: res.data.msg,
+ });
+
+ app.showToast(res.data.msg);
+ }
+ },
+ fail: () => {
+ my.hideLoading();
+ my.stopPullDownRefresh();
+ self.setData({
+ data_list_loding_status: 2,
+ data_list_loding_msg: '服务器请求出错',
+ });
+
+ app.showToast("服务器请求出错");
+ }
+ });
+ },
+
+ // 下拉刷新
+ onPullDownRefresh() {
+ this.setData({
+ data_page: 1
+ });
+ this.get_data_list(1);
+ },
+
+ // 滚动加载
+ scroll_lower(e) {
+ this.get_data_list();
+ },
+
+ // 导航事件
+ nav_event(e) {
+ this.setData({
+ nav_status_index: e.target.dataset.index || 0,
+ data_page: 1,
+ });
+ this.get_data_list(1);
+ },
+
+ // 输入框事件
+ input_event(e) {
+ this.setData({ form_keyword_value: e.detail.value });
+ },
+
+ // 取消
+ cancel_event(e) {
+ my.confirm({
+ title: "温馨提示",
+ content: "取消后不可恢复,确定继续吗?",
+ confirmButtonText: "确认",
+ cancelButtonText: "不了",
+ success: result => {
+ if (result.confirm) {
+ // 参数
+ var id = e.target.dataset.value;
+ var index = e.target.dataset.index;
+
+ // 加载loding
+ my.showLoading({content: "处理中..." });
+
+ my.request({
+ url: app.get_request_url("cancel", "orderaftersale"),
+ method: "POST",
+ data: { id: id },
+ dataType: "json",
+ success: res => {
+ my.hideLoading();
+ if (res.data.code == 0) {
+ var temp_data_list = this.data.data_list;
+ temp_data_list[index]['status'] = 5;
+ temp_data_list[index]['status_text'] = '已取消';
+ this.setData({ data_list: temp_data_list });
+
+ app.showToast(res.data.msg, "success");
+ } else {
+ app.showToast(res.data.msg);
+ }
+ },
+ fail: () => {
+ my.hideLoading();
+ app.showToast("服务器请求出错");
+ }
+ });
+ }
+ }
+ });
+ },
+
+ // 退货
+ delivery_event(e) {
+ var oid = e.target.dataset.oid || 0;
+ var did = e.target.dataset.did || 0;
+ if (oid == 0 || did == 0) {
+ app.showToast("参数有误");
+ return false;
+ }
+
+ // 进入售后页面
+ my.navigateTo({
+ url: "/pages/user-orderaftersale-detail/user-orderaftersale-detail?oid=" + oid + "&did=" + did +"&is_delivery_popup=1"
+ });
+ },
+
+ // 下拉刷新
+ onPullDownRefresh() {
+ this.setData({
+ data_page: 1
+ });
+ this.get_data_list(1);
+ },
+
+});
diff --git a/public/appmini/old/alipay/pages/user-orderaftersale/user-orderaftersale.json b/public/appmini/old/alipay/pages/user-orderaftersale/user-orderaftersale.json
new file mode 100644
index 0000000000000000000000000000000000000000..ed3a57db1414299558d96397899dde30bc79134f
--- /dev/null
+++ b/public/appmini/old/alipay/pages/user-orderaftersale/user-orderaftersale.json
@@ -0,0 +1,3 @@
+{
+ "pullRefresh": true
+}
\ No newline at end of file
diff --git a/public/appmini/old/alipay/pages/user/user.js b/public/appmini/old/alipay/pages/user/user.js
index 098ee7b6d67625d5de5e5bd9235432490a866133..947ede423c84d3296577924a742eee01e93041d1 100644
--- a/public/appmini/old/alipay/pages/user/user.js
+++ b/public/appmini/old/alipay/pages/user/user.js
@@ -49,6 +49,7 @@ Page({
confirmButtonText: '确认',
cancelButtonText: '暂不',
success: (result) => {
+ my.stopPullDownRefresh();
if(result.confirm) {
my.navigateTo({
url: "/pages/login/login?event_callback=init"
@@ -58,7 +59,6 @@ Page({
avatar: user.avatar || app.data.default_user_head_src,
nickname: user.user_name_view || '用户名',
});
- my.stopPullDownRefresh();
},
});
} else {
diff --git a/public/appmini/old/baidu/pages/user-orderaftersale/user-orderaftersale.swan b/public/appmini/old/baidu/pages/user-orderaftersale/user-orderaftersale.swan
index b3f0335bf61e29858cd931eae2ec1d4a4b12fd26..d7257691e0673ee692adcda98c9248842d2f7e9e 100644
--- a/public/appmini/old/baidu/pages/user-orderaftersale/user-orderaftersale.swan
+++ b/public/appmini/old/baidu/pages/user-orderaftersale/user-orderaftersale.swan
@@ -44,8 +44,7 @@
-
+
diff --git a/public/appmini/old/baidu/pages/user/user.js b/public/appmini/old/baidu/pages/user/user.js
index 1322547a992739140201e23c75a203696d54a09a..273b5264d658a4e454e6637e65276d853fbfaa13 100755
--- a/public/appmini/old/baidu/pages/user/user.js
+++ b/public/appmini/old/baidu/pages/user/user.js
@@ -46,6 +46,7 @@ Page({
confirmText: '确认',
cancelText: '暂不',
success: result => {
+ swan.stopPullDownRefresh();
if (result.confirm) {
swan.navigateTo({
url: "/pages/login/login?event_callback=init"
@@ -55,7 +56,6 @@ Page({
avatar: user.avatar || app.data.default_user_head_src,
nickname: user.user_name_view || '用户名'
});
- swan.stopPullDownRefresh();
}
});
} else {
diff --git a/public/appmini/old/weixin/pages/user-orderaftersale/user-orderaftersale.wxml b/public/appmini/old/weixin/pages/user-orderaftersale/user-orderaftersale.wxml
index 16f58006b9e5ecd979ec93c5d3c873c57ff4b2be..852fddf640cca0ff4893b905166efde17fa3cde9 100644
--- a/public/appmini/old/weixin/pages/user-orderaftersale/user-orderaftersale.wxml
+++ b/public/appmini/old/weixin/pages/user-orderaftersale/user-orderaftersale.wxml
@@ -44,8 +44,7 @@
-
+
diff --git a/public/appmini/old/weixin/pages/user/user.js b/public/appmini/old/weixin/pages/user/user.js
index c003370feeb508d87f059f238db9f852a9ebaa0c..c8147f11f32c409d767bdd0a91e5d1cb7582b919 100755
--- a/public/appmini/old/weixin/pages/user/user.js
+++ b/public/appmini/old/weixin/pages/user/user.js
@@ -50,6 +50,7 @@ Page({
confirmText: '确认',
cancelText: '暂不',
success: (result) => {
+ wx.stopPullDownRefresh();
if(result.confirm) {
wx.navigateTo({
url: "/pages/login/login?event_callback=init"
@@ -59,7 +60,6 @@ Page({
avatar: user.avatar || app.data.default_user_head_src,
nickname: user.user_name_view || '用户名',
});
- wx.stopPullDownRefresh();
},
});
} else {
diff --git a/public/static/admin/default/css/orderaftersale.css b/public/static/admin/default/css/orderaftersale.css
index 0ab4d876c8152ae46a809eb7344fc9c729dee6e2..ac528b7dddb2e625815344a3f6b1479382de8375 100644
--- a/public/static/admin/default/css/orderaftersale.css
+++ b/public/static/admin/default/css/orderaftersale.css
@@ -1,7 +1,7 @@
/**
* 商品列表
*/
-.content-right .goods-detail img { width: 80px; height: 80px; position: absolute; }
+.content-right .goods-detail img { width: 80px; height: 80px; position: absolute; left: 0; }
.content-right .goods-detail { position: relative; min-height: 80px; }
.content-right .goods-title { display: block; max-height: 36px; overflow: hidden; text-overflow: ellipsis; }
.content-right .goods-title:hover { text-decoration: underline; }