diff --git a/application/admin/controller/Admin.php b/application/admin/controller/Admin.php index 29ed6126e..91d7d1064 100755 --- a/application/admin/controller/Admin.php +++ b/application/admin/controller/Admin.php @@ -69,6 +69,7 @@ class Admin extends Common 'url' => MyUrl('admin/admin/index'), ); $page = new \base\Page($page_params); + $this->assign('page_html', $page->GetPageHtml()); // 获取管理员列表 $data_params = [ @@ -77,6 +78,7 @@ class Admin extends Common 'n' => $number, ]; $data = AdminService::AdminList($data_params); + $this->assign('data_list', $data['data']); // 角色 $role_params = [ @@ -84,14 +86,12 @@ class Admin extends Common 'field' => 'id,name', ]; $role = AdminService::RoleList($role_params); + $this->assign('role_list', $role['data']); // 性别 $this->assign('common_gender_list', lang('common_gender_list')); - $this->assign('role', $role); $this->assign('params', $params); - $this->assign('page_html', $page->GetPageHtml()); - $this->assign('data', $data); return $this->fetch(); } @@ -127,11 +127,11 @@ class Admin extends Common 'n' => 1, ]; $ret = AdminService::AdminList($data_params); - if(empty($ret[0])) + if(empty($ret['data'][0])) { return $this->error('管理员信息不存在', MyUrl('admin/index/index')); } - $data = $ret[0]; + $data = $ret['data'][0]; } // 角色 @@ -139,7 +139,8 @@ class Admin extends Common 'where' => ['is_enable'=>1], 'field' => 'id,name', ]; - $this->assign('role', AdminService::RoleList($role_params)); + $role = AdminService::RoleList($role_params); + $this->assign('role_list', $role['data']); $this->assign('id', isset($params['id']) ? $params['id'] : 0); $this->assign('common_gender_list', lang('common_gender_list')); diff --git a/application/admin/view/default/admin/index.html b/application/admin/view/default/admin/index.html index 71f658a2b..bb06b984d 100755 --- a/application/admin/view/default/admin/index.html +++ b/application/admin/view/default/admin/index.html @@ -30,7 +30,7 @@ 权限： @@ -89,8 +89,8 @@ - {{if !empty($data)}} - {{foreach $data as $v}} + {{if !empty($data_list)}} + {{foreach $data_list as $v}} {{$v.username}} {{:lang('common_gender_list')[$v['gender']]['name']}} @@ -128,14 +128,14 @@ {{/if}} + {{if empty($data_list)}} +
没有相关数据
+ {{/if}} - {{if empty($data)}} -
没有相关数据
- {{/if}} - {{if !empty($data)}} + {{if !empty($data_list)}} {{$page_html|raw}} {{/if}} diff --git a/application/admin/view/default/admin/save_info.html b/application/admin/view/default/admin/save_info.html index feca0a039..1d1a6c859 100755 --- a/application/admin/view/default/admin/save_info.html +++ b/application/admin/view/default/admin/save_info.html @@ -32,7 +32,7 @@ diff --git a/application/admin/view/default/answer/index.html b/application/admin/view/default/answer/index.html index 7229a4b6c..d4dd9bcaf 100755 --- a/application/admin/view/default/answer/index.html +++ b/application/admin/view/default/answer/index.html @@ -285,10 +285,10 @@ {{/if}} + {{if empty($data_list)}} +
没有相关数据
+ {{/if}} - {{if empty($data_list)}} -
没有相关数据
- {{/if}} diff --git a/application/admin/view/default/appcenternav/index.html b/application/admin/view/default/appcenternav/index.html index 0e939c6d6..6f5d9fea3 100755 --- a/application/admin/view/default/appcenternav/index.html +++ b/application/admin/view/default/appcenternav/index.html @@ -193,10 +193,10 @@ {{/if}} + {{if empty($data_list)}} +
没有相关数据
+ {{/if}} - {{if empty($data_list)}} -
没有相关数据
- {{/if}} diff --git a/application/admin/view/default/apphomenav/index.html b/application/admin/view/default/apphomenav/index.html index 140ae2cb7..7b2837972 100755 --- a/application/admin/view/default/apphomenav/index.html +++ b/application/admin/view/default/apphomenav/index.html @@ -212,10 +212,10 @@ {{/if}} + {{if empty($data_list)}} +
没有相关数据
+ {{/if}} - {{if empty($data_list)}} -
没有相关数据
- {{/if}} diff --git a/application/admin/view/default/appminialipaylist/index.html b/application/admin/view/default/appminialipaylist/index.html index f2f0a4878..40d9f5e24 100755 --- a/application/admin/view/default/appminialipaylist/index.html +++ b/application/admin/view/default/appminialipaylist/index.html @@ -59,10 +59,10 @@ {{/if}} + {{if empty($data_list)}} +
没有相关数据
+ {{/if}} - {{if empty($data_list)}} -
没有相关数据
- {{/if}} diff --git a/application/admin/view/default/appminibaidulist/index.html b/application/admin/view/default/appminibaidulist/index.html index f6fe39bcb..c5125260f 100755 --- a/application/admin/view/default/appminibaidulist/index.html +++ b/application/admin/view/default/appminibaidulist/index.html @@ -59,10 +59,10 @@ {{/if}} + {{if empty($data_list)}} +
没有相关数据
+ {{/if}} - {{if empty($data_list)}} -
没有相关数据
- {{/if}} diff --git a/application/admin/view/default/appminiqqlist/index.html b/application/admin/view/default/appminiqqlist/index.html index 89ba0c35f..9cb620a5b 100755 --- a/application/admin/view/default/appminiqqlist/index.html +++ b/application/admin/view/default/appminiqqlist/index.html @@ -59,10 +59,10 @@ {{/if}} + {{if empty($data_list)}} +
没有相关数据
+ {{/if}} - {{if empty($data_list)}} -
没有相关数据
- {{/if}} diff --git a/application/admin/view/default/appminitoutiaolist/index.html b/application/admin/view/default/appminitoutiaolist/index.html index 3b7d19acb..ba66d6497 100755 --- a/application/admin/view/default/appminitoutiaolist/index.html +++ b/application/admin/view/default/appminitoutiaolist/index.html @@ -59,10 +59,10 @@ {{/if}} + {{if empty($data_list)}} +
没有相关数据
+ {{/if}} - {{if empty($data_list)}} -
没有相关数据
- {{/if}} diff --git a/application/admin/view/default/appminiweixinlist/index.html b/application/admin/view/default/appminiweixinlist/index.html index 674f1abb4..b910c7c56 100755 --- a/application/admin/view/default/appminiweixinlist/index.html +++ b/application/admin/view/default/appminiweixinlist/index.html @@ -59,10 +59,10 @@ {{/if}} + {{if empty($data_list)}} +
没有相关数据
+ {{/if}} - {{if empty($data_list)}} -
没有相关数据
- {{/if}} diff --git a/application/admin/view/default/article/index.html b/application/admin/view/default/article/index.html index b2e4b646e..688da15c1 100755 --- a/application/admin/view/default/article/index.html +++ b/application/admin/view/default/article/index.html @@ -225,10 +225,10 @@ {{/if}} + {{if empty($data_list)}} +
没有相关数据
+ {{/if}} - {{if empty($data_list)}} -
没有相关数据
- {{/if}} diff --git a/application/admin/view/default/brand/index.html b/application/admin/view/default/brand/index.html index 3071b4749..b7d7c11ce 100755 --- a/application/admin/view/default/brand/index.html +++ b/application/admin/view/default/brand/index.html @@ -234,10 +234,10 @@ {{/if}} + {{if empty($data_list)}} +
没有相关数据
+ {{/if}} - {{if empty($data_list)}} -
没有相关数据
- {{/if}} diff --git a/application/admin/view/default/customview/index.html b/application/admin/view/default/customview/index.html index 8e41477e6..ec04a7d6f 100755 --- a/application/admin/view/default/customview/index.html +++ b/application/admin/view/default/customview/index.html @@ -191,10 +191,10 @@ {{/if}} + {{if empty($data_list)}} +
没有相关数据
+ {{/if}} - {{if empty($data_list)}} -
没有相关数据
- {{/if}} diff --git a/application/admin/view/default/goods/index.html b/application/admin/view/default/goods/index.html index a37e3fe3f..e4f74ba39 100755 --- a/application/admin/view/default/goods/index.html +++ b/application/admin/view/default/goods/index.html @@ -307,10 +307,10 @@ {{/if}} + {{if empty($data_list)}} +
没有相关数据
+ {{/if}} - {{if empty($data_list)}} -
没有相关数据
- {{/if}} diff --git a/application/admin/view/default/goodscomments/index.html b/application/admin/view/default/goodscomments/index.html index 750e137ea..4feabe62b 100644 --- a/application/admin/view/default/goodscomments/index.html +++ b/application/admin/view/default/goodscomments/index.html @@ -345,10 +345,10 @@ {{/if}} + {{if empty($data_list)}} +
没有相关数据
+ {{/if}} - {{if empty($data_list)}} -
没有相关数据
- {{/if}} diff --git a/application/admin/view/default/integrallog/index.html b/application/admin/view/default/integrallog/index.html index 048abc96c..5aed613f1 100755 --- a/application/admin/view/default/integrallog/index.html +++ b/application/admin/view/default/integrallog/index.html @@ -108,10 +108,10 @@ {{/if}} + {{if empty($data_list)}} +
没有相关数据
+ {{/if}} - {{if empty($data_list)}} -
没有相关数据
- {{/if}} diff --git a/application/admin/view/default/link/index.html b/application/admin/view/default/link/index.html index 0833ef249..5eb5b9552 100755 --- a/application/admin/view/default/link/index.html +++ b/application/admin/view/default/link/index.html @@ -50,10 +50,10 @@ {{/if}} + {{if empty($data_list)}} +
没有相关数据
+ {{/if}} - {{if empty($data_list)}} -
没有相关数据
- {{/if}} diff --git a/application/admin/view/default/message/index.html b/application/admin/view/default/message/index.html index 206ec7e0c..d1f221fa3 100755 --- a/application/admin/view/default/message/index.html +++ b/application/admin/view/default/message/index.html @@ -145,10 +145,10 @@ {{/if}} + {{if empty($data_list)}} +
没有相关数据
+ {{/if}} - {{if empty($data_list)}} -
没有相关数据
- {{/if}} diff --git a/application/admin/view/default/navigation/index.html b/application/admin/view/default/navigation/index.html index dd4106ff7..80b39de52 100755 --- a/application/admin/view/default/navigation/index.html +++ b/application/admin/view/default/navigation/index.html @@ -84,10 +84,10 @@ {{/if}} + {{if empty($data_list)}} +
没有相关数据
+ {{/if}} - {{if empty($data_list)}} -
没有相关数据
- {{/if}} diff --git a/application/admin/view/default/orderaftersale/index.html b/application/admin/view/default/orderaftersale/index.html index 3add48c1e..82cf04ec7 100644 --- a/application/admin/view/default/orderaftersale/index.html +++ b/application/admin/view/default/orderaftersale/index.html @@ -372,10 +372,10 @@ {{/if}} + {{if empty($data_list)}} +
没有相关数据
+ {{/if}} - {{if empty($data_list)}} -
没有相关数据
- {{/if}} diff --git a/application/admin/view/default/paylog/index.html b/application/admin/view/default/paylog/index.html index 72d84e780..f18392599 100755 --- a/application/admin/view/default/paylog/index.html +++ b/application/admin/view/default/paylog/index.html @@ -151,10 +151,10 @@ {{/if}} + {{if empty($data_list)}} +
没有相关数据
+ {{/if}} - {{if empty($data_list)}} -
没有相关数据
- {{/if}} diff --git a/application/admin/view/default/payment/index.html b/application/admin/view/default/payment/index.html index ffcab99a5..f60f048a8 100755 --- a/application/admin/view/default/payment/index.html +++ b/application/admin/view/default/payment/index.html @@ -121,10 +121,10 @@ {{/if}} + {{if empty($data_list)}} +
没有相关数据
+ {{/if}} - {{if empty($data_list)}} -
没有相关数据
- {{/if}} diff --git a/application/admin/view/default/power/role.html b/application/admin/view/default/power/role.html index 7bf839700..ffaeb612c 100755 --- a/application/admin/view/default/power/role.html +++ b/application/admin/view/default/power/role.html @@ -50,10 +50,10 @@ {{/if}} + {{if empty($data_list)}} +
没有相关数据
+ {{/if}} - {{if empty($data_list)}} -
没有相关数据
- {{/if}} diff --git a/application/admin/view/default/refundlog/index.html b/application/admin/view/default/refundlog/index.html index 842e7b9d1..35d6a3dd8 100644 --- a/application/admin/view/default/refundlog/index.html +++ b/application/admin/view/default/refundlog/index.html @@ -155,10 +155,10 @@ {{/if}} + {{if empty($data_list)}} +
没有相关数据
+ {{/if}} - {{if empty($data_list)}} -
没有相关数据
- {{/if}} diff --git a/application/admin/view/default/slide/index.html b/application/admin/view/default/slide/index.html index 003865ba7..a3d1d7525 100755 --- a/application/admin/view/default/slide/index.html +++ b/application/admin/view/default/slide/index.html @@ -191,10 +191,10 @@ {{/if}} + {{if empty($data_list)}} +
没有相关数据
+ {{/if}} - {{if empty($data_list)}} -
没有相关数据
- {{/if}} diff --git a/application/admin/view/default/user/index.html b/application/admin/view/default/user/index.html index 52d73d261..0ea9ff17d 100755 --- a/application/admin/view/default/user/index.html +++ b/application/admin/view/default/user/index.html @@ -265,10 +265,10 @@ {{/if}} + {{if empty($data_list)}} +
没有相关数据
+ {{/if}} - {{if empty($data_list)}} -
没有相关数据
- {{/if}} diff --git a/application/service/AdminService.php b/application/service/AdminService.php index a5bfe1c77..88452fcd2 100755 --- a/application/service/AdminService.php +++ b/application/service/AdminService.php @@ -47,7 +47,7 @@ class AdminService $v['role_name'] = Db::name('Role')->where(['id'=>$v['role_id']])->value('name'); } } - return $data; + return DataReturn('处理成功', 0, $data); } /** @@ -118,7 +118,8 @@ class AdminService { $where = empty($params['where']) ? [] : $params['where']; $field = empty($params['field']) ? '*' : $params['field']; - return Db::name('Role')->field($field)->where($where)->select(); + $data = Db::name('Role')->field($field)->where($where)->select(); + return DataReturn('处理成功', 0, $data); } /** diff --git a/application/service/OrderAftersaleService.php b/application/service/OrderAftersaleService.php index 3fc217041..4fe9b8e9a 100644 --- a/application/service/OrderAftersaleService.php +++ b/application/service/OrderAftersaleService.php @@ -1410,7 +1410,7 @@ class OrderAftersaleService } } - // 如果最后一件退款则加上增加的金额，减去优惠家呢 + // 如果最后一件退款则加上增加的金额，减去优惠金额 if(PriceNumberFormat($history_refund_price+$refund_price) >= $order['price']) { $refund_price += $order['increase_price']; diff --git a/application/tags.php b/application/tags.php index f0b0022ef..7865563bf 100755 --- a/application/tags.php +++ b/application/tags.php @@ -40,6 +40,15 @@ return array ( array ( 0 => 'app\\plugins\\orderexportprint\\Hook', ), + 'plugins_css' => + array ( + 0 => 'app\\plugins\\excellentbuyreturntocash\\Hook', + 1 => 'app\\plugins\\coupon\\Hook', + 2 => 'app\\plugins\\distribution\\Hook', + 3 => 'app\\plugins\\commononlineservice\\Hook', + 4 => 'app\\plugins\\membershiplevelvip\\Hook', + 5 => 'app\\plugins\\share\\Hook', + ), 'plugins_service_users_center_left_menu_handle' => array ( 0 => 'app\\plugins\\excellentbuyreturntocash\\Hook', @@ -76,27 +85,26 @@ return array ( 1 => 'app\\plugins\\coupon\\Hook', 2 => 'app\\plugins\\distribution\\Hook', ), - 'plugins_css' => + 'plugins_view_goods_detail_panel_bottom' => array ( - 0 => 'app\\plugins\\coupon\\Hook', - 1 => 'app\\plugins\\distribution\\Hook', - 2 => 'app\\plugins\\commononlineservice\\Hook', - 3 => 'app\\plugins\\membershiplevelvip\\Hook', + 0 => 'app\\plugins\\excellentbuyreturntocash\\Hook', + 1 => 'app\\plugins\\coupon\\Hook', + ), + 'plugins_view_goods_detail_title' => + array ( + 0 => 'app\\plugins\\excellentbuyreturntocash\\Hook', ), 'plugins_js' => array ( 0 => 'app\\plugins\\coupon\\Hook', 1 => 'app\\plugins\\commononlineservice\\Hook', + 2 => 'app\\plugins\\share\\Hook', ), 'plugins_service_navigation_header_handle' => array ( 0 => 'app\\plugins\\coupon\\Hook', 1 => 'app\\plugins\\membershiplevelvip\\Hook', ), - 'plugins_view_goods_detail_panel_bottom' => - array ( - 0 => 'app\\plugins\\coupon\\Hook', - ), 'plugins_view_buy_goods_bottom' => array ( 0 => 'app\\plugins\\coupon\\Hook', @@ -153,6 +161,7 @@ return array ( 'plugins_view_common_bottom' => array ( 0 => 'app\\plugins\\commononlineservice\\Hook', + 1 => 'app\\plugins\\share\\Hook', ), 'plugins_service_goods_handle_end' => array ( @@ -188,5 +197,9 @@ return array ( array ( 0 => 'app\\plugins\\membershiplevelvip\\Hook', ), + 'plugins_view_goods_detail_photo_bottom' => + array ( + 0 => 'app\\plugins\\share\\Hook', + ), ); ?> \ No newline at end of file diff --git a/public/static/admin/default/css/common.css b/public/static/admin/default/css/common.css index 3ad754e77..46c8991e9 100755 --- a/public/static/admin/default/css/common.css +++ b/public/static/admin/default/css/common.css @@ -479,7 +479,7 @@ ul {margin-top:0;} */ .menu-mini-container-tips{position:absolute;left:63px;top:0;padding:0 10px;width:auto;height:35px;line-height:35px;text-align:center;color:#fff;background-color:#01bcd4;-webkit-box-shadow:0 0 5px rgba(0,0,0,.2);-moz-box-shadow:0 0 5px rgba(0,0,0,.2);box-shadow:0 0 5px rgba(0,0,0,.2);font-weight:700;display:none;z-index:1001;} .menu-mini-container-tips span{font-size:12px} -.menu-mini-container-tips .mui-mbar-tab-tip,.menu-mini-container-popup .mui-mbar-tab-tip{position:absolute;width:16px;height:16px;line-height:16px;text-align:center;font-size:16px;font-family:"\5b8b\4f53";top:10px;left:-11px;z-index:0;color:#01bcd4;} +.menu-mini-container-tips .mui-mbar-tab-tip,.menu-mini-container-popup .mui-mbar-tab-tip{position:absolute;width:16px;height:16px;line-height:16px;text-align:center;font-size:16px;font-family:"\5b8b\4f53";top:10px;left:-10px;z-index:0;color:#01bcd4;} /** * mini子菜单 diff --git a/public/static/admin/default/css/pluginsadmin.css b/public/static/admin/default/css/pluginsadmin.css index d733afaaa..fac443410 100755 --- a/public/static/admin/default/css/pluginsadmin.css +++ b/public/static/admin/default/css/pluginsadmin.css @@ -61,8 +61,6 @@ margin: 10px 0; height: 36px; line-height: 18px; - font-weight: 300; - color: #b3b3b3; } .content ul.am-gallery-bordered li .operation { border-top: 1px dashed #eee; diff --git a/sourcecode/weixin/app.js b/sourcecode/weixin/app.js index ee75643ba..be1e8ebcd 100755 --- a/sourcecode/weixin/app.js +++ b/sourcecode/weixin/app.js @@ -67,7 +67,7 @@ App({ // 请求地址 request_url: "{{request_url}}", - // request_url: 'http://shopxo.com/', + request_url: 'http://shopxo.com/', // request_url: 'https://dev.shopxo.net/', // 基础信息 @@ -559,6 +559,49 @@ App({ } }, + /** + * alert确认框 + * title [string] 标题（默认空） + * msg [string] 提示信息，必传 + * is_show_cancel [int] 是否显示取消按钮（默认显示 0否, 1|undefined是） + * cancel_text [string] 取消按钮文字（默认 取消） + * cancel_color [string] 取消按钮的文字颜色，必须是 16 进制格式的颜色字符串（默认 #000000） + * confirm_text [string] 确认按钮文字（默认 确认） + * confirm_color [string] 确认按钮的文字颜色，必须是 16 进制格式的颜色字符串（默认 #000000） + * object [boject] 回调操作对象，点击确认回调参数1，取消回调0 + * method [string] 回调操作对象的函数 + */ + alert(e) + { + var msg = e.msg || null; + if (msg != null) + { + var title = e.title || ''; + var is_show_cancel = (e.is_show_cancel == 0) ? false : true; + var cancel_text = e.cancel_text || '取消'; + var confirm_text = e.confirm_text || '确认'; + var cancel_color = e.cancel_color || ''; + var confirm_color = e.confirm_color || ''; + + wx.showModal({ + title: title, + content: msg, + showCancel: is_show_cancel, + cancelText: cancel_text, + cancelColor: cancel_color, + confirmText: confirm_text, + confirmColor: confirm_color, + success(res) { + if ((e.object || null) != null && typeof e.object === 'object' && (e.method || null) != null) { + e.object[e.method](res.confirm ? 1 : 0); + } + } + }); + } else { + self.showToast('提示信息为空 alert'); + } + }, + /** * 是否需要登录 * 是否需要绑定手机号码 diff --git a/sourcecode/weixin/app.json b/sourcecode/weixin/app.json index 993b8f249..d1581d9e3 100755 --- a/sourcecode/weixin/app.json +++ b/sourcecode/weixin/app.json @@ -61,7 +61,9 @@ "pages/plugins/wallet/user-recharge/user-recharge", "pages/plugins/wallet/user-recharge-detail/user-recharge-detail", "pages/plugins/wallet/user-cash/user-cash", - "pages/plugins/wallet/user-cash-detail/user-cash-detail" + "pages/plugins/wallet/user-cash-detail/user-cash-detail", + "pages/plugins/excellentbuyreturntocash/profit/profit", + "pages/plugins/excellentbuyreturntocash/profit-detail/profit-detail" ], "permission": { "scope.userLocation": { diff --git a/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit-detail/profit-detail.js b/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit-detail/profit-detail.js new file mode 100644 index 000000000..5dda9079d --- /dev/null +++ b/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit-detail/profit-detail.js @@ -0,0 +1,91 @@ +const app = getApp(); +Page({ + data: { + params: null, + data_list_loding_status: 1, + data_list_loding_msg: '', + data_bottom_line_status: false, + + detail: null, + detail_list: [], + }, + + onLoad(params) { + //params['id'] = 1; + this.setData({ params: params }); + this.init(); + }, + + onShow() {}, + + init() { + var self = this; + wx.showLoading({ title: "加载中..." }); + this.setData({ + data_list_loding_status: 1 + }); + + wx.request({ + url: app.get_request_url("detail", "profit", "excellentbuyreturntocash"), + method: "POST", + data: { + id: this.data.params.id + }, + dataType: "json", + success: res => { + wx.hideLoading(); + wx.stopPullDownRefresh(); + if (res.data.code == 0) { + var data = res.data.data; + self.setData({ + detail: data.data, + detail_list: [ + { name: "订单号", value: data.data.order_no }, + { name: "订单金额", value: data.data.total_price + '元' || '' }, + { name: "退款金额", value: data.data.refund_price + '元' || '' }, + { name: "有效金额", value: data.data.valid_price + '元' || '' }, + { name: "返现金额", value: data.data.profit_price + '元' || '' }, + { name: "结算状态", value: data.data.status_name || '' }, + { name: "订单状态", value: data.data.order_status_name || '' }, + { name: "订单支付状态", value: data.data.order_pay_status_name || '' }, + { name: "来源终端", value: data.data.order_client_type_name || '' }, + { name: "结算时间", value: (data.data.status == 2 && (data.data.success_estimate_icon || null) != null ? '(' + data.data.success_estimate_icon + ') ' : '') +data.data.success_time || '' }, + { name: "添加时间", value: data.data.add_time || '' }, + { name: "更新时间", value: data.data.upd_time || '' }, + ], + + data_list_loding_status: 3, + data_bottom_line_status: true, + data_list_loding_msg: '', + }); + } else { + self.setData({ + data_list_loding_status: 2, + data_bottom_line_status: false, + data_list_loding_msg: res.data.msg, + }); + if (app.is_login_check(res.data, self, 'init')) { + app.showToast(res.data.msg); + } + } + }, + fail: () => { + wx.hideLoading(); + wx.stopPullDownRefresh(); + self.setData({ + data_list_loding_status: 2, + data_bottom_line_status: false, + data_list_loding_msg: '服务器请求出错', + }); + + app.showToast("服务器请求出错"); + } + }); + }, + + // 下拉刷新 + onPullDownRefresh() { + this.init(); + }, + +}); \ No newline at end of file diff --git a/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit-detail/profit-detail.json b/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit-detail/profit-detail.json new file mode 100644 index 000000000..f94ae0bb5 --- /dev/null +++ b/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit-detail/profit-detail.json @@ -0,0 +1,4 @@ +{ + "enablePullDownRefresh": true, + "navigationBarTitleText": "返现详情" +} \ No newline at end of file diff --git a/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit-detail/profit-detail.wxml b/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit-detail/profit-detail.wxml new file mode 100644 index 000000000..ea113e13c --- /dev/null +++ b/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit-detail/profit-detail.wxml @@ -0,0 +1,24 @@ + + + + + {{item.name}} + {{item.value}} + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit-detail/profit-detail.wxss b/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit-detail/profit-detail.wxss new file mode 100644 index 000000000..bf22478b7 --- /dev/null +++ b/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit-detail/profit-detail.wxss @@ -0,0 +1,27 @@ +.panel-item .panel-title { + background: #fff; + font-weight: bold; + padding: 15rpx; + border-bottom: 2px solid #eee; + font-size: 34rpx; +} +.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; + word-wrap: break-word; + word-break: normal; +} +.panel-item .panel-content .item view { + line-height: 46rpx; +} \ No newline at end of file diff --git a/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit/profit.js b/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit/profit.js new file mode 100644 index 000000000..c3faa11b0 --- /dev/null +++ b/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit/profit.js @@ -0,0 +1,201 @@ +const app = getApp(); +Page({ + data: { + data_list: [], + data_page_total: 0, + data_page: 1, + data_list_loding_status: 1, + data_bottom_line_status: false, + params: null, + nav_status_list: [ + { name: "全部", value: "-1" }, + { name: "待生效", value: "0" }, + { name: "生效中", value: "1" }, + { name: "待结算", value: "2" }, + { name: "已结算", value: "3" }, + { name: "已失效", value: "4" }, + ], + 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, + nav_status_index: nav_status_index, + }); + this.init(); + }, + + onShow() {}, + + init() { + var user = app.get_user_info(this, 'init'); + if (user != false) { + // 用户未绑定用户则转到登录页面 + if (app.user_is_need_login(user)) { + wx.redirectTo({ + url: "/pages/login/login?event_callback=init" + }); + return false; + } else { + // 获取数据 + this.get_data_list(); + } + } else { + this.setData({ + data_list_loding_status: 0, + data_bottom_line_status: false, + }); + } + }, + + // 获取数据 + get_data_list(is_mandatory) { + // 分页是否还有数据 + if ((is_mandatory || 0) == 0) { + if (this.data.data_bottom_line_status == true) { + return false; + } + } + + // 加载loding + wx.showLoading({ title: "加载中..." }); + 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']; + + // 获取数据 + wx.request({ + url: app.get_request_url("index", "profit", "excellentbuyreturntocash"), + method: "POST", + data: { + page: this.data.data_page, + status: status, + is_more: 1, + }, + dataType: "json", + success: res => { + wx.hideLoading(); + wx.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: [], + data_bottom_line_status: false, + }); + } + } else { + this.setData({ + data_list_loding_status: 0, + }); + if (app.is_login_check(res.data, this, 'get_data_list')) { + app.showToast(res.data.msg); + } + } + }, + fail: () => { + wx.hideLoading(); + wx.stopPullDownRefresh(); + + this.setData({ + data_list_loding_status: 2, + }); + app.showToast("服务器请求出错"); + } + }); + }, + + // 立即结算事件 + list_submit_settlement_event(e) { + var index = e.currentTarget.dataset.index || 0; + var self = this; + + // 提交数据 + wx.showLoading({ title: "处理中..." }); + wx.request({ + url: app.get_request_url("auto", "profit", "excellentbuyreturntocash"), + method: "POST", + data: { id: self.data.data_list[index]['id']}, + dataType: "json", + success: res => { + wx.hideLoading(); + if (res.data.code == 0) { + var temp_data_list = this.data.data_list; + temp_data_list[index]['status'] = 3; + temp_data_list[index]['status_name'] = '已结算'; + self.setData({ + data_list: temp_data_list, + }); + app.showToast(res.data.msg, "success"); + } else { + app.alert({ msg: res.data.msg, is_show_cancel: 0}); + } + }, + fail: () => { + wx.hideLoading(); + 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.currentTarget.dataset.index || 0, + data_page: 1, + }); + this.get_data_list(1); + }, +}); \ No newline at end of file diff --git a/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit/profit.json b/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit/profit.json new file mode 100644 index 000000000..93a485731 --- /dev/null +++ b/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit/profit.json @@ -0,0 +1,4 @@ +{ + "enablePullDownRefresh": true, + "navigationBarTitleText": "返现明细" +} \ No newline at end of file diff --git a/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit/profit.wxml b/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit/profit.wxml new file mode 100644 index 000000000..d8050bedf --- /dev/null +++ b/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit/profit.wxml @@ -0,0 +1,54 @@ + + + + {{item.name}} + + + + + + + + + {{item.add_time_time}} + {{item.status_name}} + + + + + 订单金额 + {{item.total_price}} + 元 + + + 退款金额 + {{item.refund_price}} + 元 + + + 有效金额 + {{item.valid_price}} + 元 + + + 返现金额 + {{item.profit_price}} + 元 + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit/profit.wxss b/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit/profit.wxss new file mode 100644 index 000000000..48035c61c --- /dev/null +++ b/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit/profit.wxss @@ -0,0 +1,47 @@ +/* + * 导航 + */ +.nav { + background: #eee; + height: 80rpx; + line-height: 80rpx; +} +.nav .item { + width: 16.66%; +} +.nav .active { + color: #d2364c; +} + +/* + * 列表 + */ +.scroll-box { + height: calc(100vh - 80rpx); +} +.data-list .item .base, +.data-list .item .content { + padding: 20rpx 10rpx; +} +.data-list .item .content .multi-text { + line-height: 50rpx; +} +.data-list .item .content .multi-text .title { + margin-right: 30rpx; +} +.data-list .item .content .multi-text .value { + font-weight: 500; +} +.data-list .item .content .multi-text .unit { + margin-left: 10rpx; +} +.data-list .item .operation { + padding: 20rpx 10rpx; +} +.data-list .item .submit-order { + border: 1px solid #e5e5e5; + color: #888 !important; +} +.data-list .item .operation button:not(:first-child) { + margin-left: 30rpx; +} \ No newline at end of file