wesmiler

public/static/weixin/js/photo.js

@@ -457,11 +457,12 @@ var app = new Vue({
             }
         },
         // 编辑图片
-        picEdit: function (id, data) {
+        picEdit: function (id, data, type) {
             var _this = this;
             $.closePopup();
             _this.cropParams = data;
             _this.cropParams.id = id;
+            _this.cropParams.type = type;
             if (_this.cropParams.url == '') {
                 $.toast('请重新添加图片');
                 return false;
@@ -643,7 +644,7 @@ var app = new Vue({
                         var timestamp = Date.parse(new Date());
                         e.name = timestamp + ".png";
                         url = URL.createObjectURL(e);
-                        if(id>=0){
+                        if(_this.cropParams.type && id>=0){
                             _this.picList[id] = _this.cropParams;
                             _this.picList[id].url = url;
                             _this.picList[id].preview = url;
@@ -710,7 +711,7 @@ var app = new Vue({
                             $("#upload").val("");
                             // _this.picList.push(img);
                             // console.log(_this.picList)
-                            _this.picEdit(-1, img);
+                            _this.picEdit(0, img, 0);
                         }
                     }
                 })

public/themes/default/weixin/print/photo.html

@@ -30,7 +30,7 @@
                     <div class="op">
                         <img class="del" src="/static/weixin/img/icon/del.png" width="24" height="24" @click="picDel(k)">
                         <p class="edit">
-                            <span class="edit" @click="picEdit(k, pic)"><img src="/static/weixin/img/icon/edit.png" width="24" height="24"/>编辑</span>
+                            <span class="edit" @click="picEdit(k, pic, 1)"><img src="/static/weixin/img/icon/edit.png" width="24" height="24"/>编辑</span>
                             <span class="prev" @click="picPreview(k, pic)"><img src="/static/weixin/img/icon/look.png" width="24" height="24"/>预览</span>
                         </p>
                         <p class="pic-color">
@@ -42,7 +42,7 @@
                 <div class="pic-box">
                     <div class="pic">
                         <div :id="'pic_preview_'+k" class="pic-preview">
-                            <img class="pic-img" :id="'pic_img_'+k" @click="picEdit(k, pic)" :src="pic.preview" :data-pic="pic.url" :alt="pic.name" :data-size="pic.file_size" onerror="javascript:this.src='/static/weixin/img/no-pic.png';" :data-type="pic.file_type">
+                            <img class="pic-img" :id="'pic_img_'+k" @click="picEdit(k, pic, 1)" :src="pic.preview" :data-pic="pic.url" :alt="pic.name" :data-size="pic.file_size" onerror="javascript:this.src='/static/weixin/img/no-pic.png';" :data-type="pic.file_type">
                         </div>
                     </div>
                 </div>