diff --git a/application/api/controller/Ueditor.php b/application/api/controller/Ueditor.php
index b213ded794d383df42f8a7c346ca067b1d9b3665..c9340506e6de079c1f997362bd7bede21f145551 100755
--- a/application/api/controller/Ueditor.php
+++ b/application/api/controller/Ueditor.php
@@ -11,6 +11,7 @@
namespace app\api\controller;
use app\service\UeditorService;
+use app\service\ResourcesService;
/**
* 附件上传
@@ -21,21 +22,18 @@ use app\service\UeditorService;
*/
class Ueditor extends Common
{
- /**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 是否登录
- $this->IsLogin();
- }
+ /**
+ * 构造方法
+ * @author Devil
+ * @blog http://gong.gg/
+ * @version 0.0.1
+ * @datetime 2016-12-03T12:39:08+0800
+ */
+ public function __construct()
+ {
+ // 调用父类前置方法
+ parent::__construct();
+ }
/**
* 运行入口
@@ -45,9 +43,14 @@ class Ueditor extends Common
* @date 2019-08-06
* @desc description
*/
- public function Index()
- {
- return DataReturn('api附件上传接口开发中', 0);
- }
+ public function Index()
+ {
+ $ret = UeditorService::Run($this->data_post);
+ if($ret['code'] == 0 && !empty($ret['data']['url']))
+ {
+ $ret['data']['url'] = ResourcesService::AttachmentPathViewHandle($ret['data']['url']);
+ }
+ return $ret;
+ }
}
?>
\ No newline at end of file
diff --git a/public/appmini/old/weixin/app.js b/public/appmini/old/weixin/app.js
index 789fdf9e0cae8881b12dca2eac8f852e2cbc1d9a..d450326aa0198d5b86a4439901bcce04c2a17237 100755
--- a/public/appmini/old/weixin/app.js
+++ b/public/appmini/old/weixin/app.js
@@ -64,7 +64,7 @@ App({
// 请求地址
request_url: "{{request_url}}",
request_url: 'http://tp5-dev.com/',
- request_url: 'https://test.shopxo.net/',
+ // request_url: 'https://test.shopxo.net/',
// 基础信息
application_title: "{{application_title}}",
diff --git a/public/appmini/old/weixin/app.json b/public/appmini/old/weixin/app.json
index 7aaa8aee5e539468c6f7c73745010b0753d9a0bf..b5f4ad94beea339daf587f9e827adc71aabd317c 100755
--- a/public/appmini/old/weixin/app.json
+++ b/public/appmini/old/weixin/app.json
@@ -1,7 +1,7 @@
{
- "pages": ["pages/user/user",
- "pages/user-order/user-order","pages/user-orderaftersale-detail/user-orderaftersale-detail",
-
+ "pages": ["pages/user-orderaftersale-detail/user-orderaftersale-detail",
+ "pages/user-order/user-order",
+ "pages/user/user",
"pages/index/index",
"pages/goods-category/goods-category",
"pages/cart/cart",
diff --git a/public/appmini/old/weixin/app.wxss b/public/appmini/old/weixin/app.wxss
index fea3e217f73a78c57abd89fb6d9381bb9f318376..b9e3f2d12f2bb565c7a77d731fcb254cda9e82d7 100755
--- a/public/appmini/old/weixin/app.wxss
+++ b/public/appmini/old/weixin/app.wxss
@@ -361,11 +361,34 @@ button[disabled].bg-primary {
.form-gorup picker view.picker {
border-bottom: 1px solid #eee;
border-radius: 0;
+ width: 100%;
+ padding: 0 10rpx;
+}
+.form-gorup input,
+.form-gorup picker view.picker {
height: 70rpx;
line-height: 70rpx;
- padding: 0 10rpx;
}
.form-gorup textarea {
- padding: 17rpx 10rpx;
+ padding: 0;
min-height: 70rpx;
+}
+
+/**
+ * 表单图片上传
+ */
+ .form-container-upload .form-upload-data .item {
+ padding: 10rpx;
+ }
+.form-container-upload .form-upload-data image {
+ width: 200rpx;
+ height: 200rpx;
+ padding: 5rpx;
+ border: 1px solid #eee;
+}
+.form-container-upload .upload-icon {
+ margin: 10rpx 0 0 10rpx;
+ width: 210rpx;
+ height: 210rpx;
+ border: 1px dashed #eee;
}
\ No newline at end of file
diff --git a/public/appmini/old/weixin/images/default-upload-icon.png b/public/appmini/old/weixin/images/default-upload-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4343beb274a53f7ff4b2118f84a67b318621dd1
Binary files /dev/null and b/public/appmini/old/weixin/images/default-upload-icon.png differ
diff --git a/public/appmini/old/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.js b/public/appmini/old/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
index be4c5ccf25d5b0eee2b399eaf67391cf87fa64ba..55eac0e9156f10c54f7897ce39b990b08ed06e1c 100644
--- a/public/appmini/old/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
+++ b/public/appmini/old/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
@@ -20,6 +20,7 @@ Page({
form_price: '',
form_msg: '',
form_number: 0,
+ form_images_list: [],
},
onLoad(params) {
@@ -129,6 +130,58 @@ Page({
});
},
+ // 文件上传
+ file_upload_event(e) {
+ var self = this;
+ wx.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) {
+ wx.uploadFile({
+ url: app.get_request_url("index", "ueditor"),
+ filePath: img_paths[count],
+ name: 'upfile',
+ formData: {
+ action: 'uploadimage',
+ },
+ success: function (res) {
+ success++;
+ if (res.statusCode == 200) {
+ var data = (typeof (res.data) == 'object') ? res.data : JSON.parse(res.data);
+ var list = self.data.form_images_list;
+ list.push(data.data.url);
+ self.setData({ form_images_list: list });
+ }
+ },
+ 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);
+ }
+ }
+ });
+ }
+ },
+
// 下拉刷新
onPullDownRefresh() {
this.init();
diff --git a/public/appmini/old/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.wxml b/public/appmini/old/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.wxml
index 9dce47916d63d738d179cdc947b3fbdefa789be6..2481dde86d681a9e2c869c619ddbdbbc0d54b9c5 100644
--- a/public/appmini/old/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.wxml
+++ b/public/appmini/old/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.wxml
@@ -37,7 +37,7 @@
退款原因必选
- {{form_reason_index == -1 ? '请选择原因...' : reason_data_list[form_reason_index]}}
+ {{form_reason_index == -1 ? '请选择原因' : reason_data_list[form_reason_index]}}
@@ -54,11 +54,23 @@
退款说明必填
-
+
+
+ 退款说明必填
+
+
+
+
+
+
+
+
+
+