anyv / xkeasy · 提交

转到一个项目

作者 anyv
提交 8b84f5353cd64abaee0948a6fc9ecb5c86089487 1 个父辈 2b3dc1e0
1 个管道 的构建 通过 耗费 1 秒

54

内嵌 并排对比
正在显示 6 个修改的文件 包含 62 行增加 和 15 行删除
@@ -117,11 +117,18 @@ class SalesmangoodsController extends WeChatBaseController{ @@ -117,11 +117,18 @@ class SalesmangoodsController extends WeChatBaseController{
117 $data['suit'] = $_POST['suit']; 117 $data['suit'] = $_POST['suit'];
118 $data['grade'] = $_POST['grade']; 118 $data['grade'] = $_POST['grade'];
119 $data['printing'] = $_POST['printing']; 119 $data['printing'] = $_POST['printing'];
120 - $det_img[0] = $_POST['img0'];  
121 - $det_img[1] = $_POST['img1'];  
122 - $det_img[2] = $_POST['img2'];  
123 - /* $data['det_img'] = $_POST['img0'].','.$_POST['img1'].','.$_POST['img2'];*/  
124 - $data['det_img'] = json_encode($det_img); 120 + if($_POST['img0'] != ''){
  121 + $det_img[0] = $_POST['img0'];
  122 + }
  123 + if($_POST['img1'] != ''){
  124 + $det_img[1] = $_POST['img1'];
  125 + }
  126 + if($_POST['img2'] != ''){
  127 + $det_img[2] = $_POST['img2'];
  128 + }
  129 + if(!empty($det_img)){
  130 + $data['det_img'] = json_encode($det_img);
  131 + }
125 $data['create_time'] = time(); 132 $data['create_time'] = time();
126 $data['type'] = 2; 133 $data['type'] = 2;
127 $data['uid'] = cmf_get_current_user_id(); 134 $data['uid'] = cmf_get_current_user_id();
@@ -161,10 +168,18 @@ class SalesmangoodsController extends WeChatBaseController{ @@ -161,10 +168,18 @@ class SalesmangoodsController extends WeChatBaseController{
161 $data['suit'] = $_POST['suit']; 168 $data['suit'] = $_POST['suit'];
162 $data['grade'] = $_POST['grade']; 169 $data['grade'] = $_POST['grade'];
163 $data['printing'] = $_POST['printing']; 170 $data['printing'] = $_POST['printing'];
164 - $a[0] = $_POST['img0'];  
165 - $a[1] = $_POST['img1'];  
166 - $a[2] = $_POST['img2'];  
167 - $data['det_img'] = json_encode($a); 171 + if($_POST['img0'] != ''){
  172 + $det_img[0] = $_POST['img0'];
  173 + }
  174 + if($_POST['img1'] != ''){
  175 + $det_img[1] = $_POST['img1'];
  176 + }
  177 + if($_POST['img2'] != ''){
  178 + $det_img[2] = $_POST['img2'];
  179 + }
  180 + if(!empty($det_img)){
  181 + $data['det_img'] = json_encode($det_img);
  182 + }
168 $data['id'] = $_POST['id']; 183 $data['id'] = $_POST['id'];
169 $up_data = Db::name('goods') -> update($data); 184 $up_data = Db::name('goods') -> update($data);
170 if($up_data){ 185 if($up_data){
@@ -175,9 +190,11 @@ class SalesmangoodsController extends WeChatBaseController{ @@ -175,9 +190,11 @@ class SalesmangoodsController extends WeChatBaseController{
175 }else{ 190 }else{
176 $id = $this -> request -> param(); 191 $id = $this -> request -> param();
177 $goods_data = Db::name('goods') -> where('id',$id['goods_id']) -> find(); 192 $goods_data = Db::name('goods') -> where('id',$id['goods_id']) -> find();
178 - $goods_data['det_img'] = json_decode($goods_data['det_img'],true);  
179 - foreach ($goods_data['det_img'] as $key => $val){  
180 - $goods_data['det_img'][$key] = cmf_get_image_url($goods_data['det_img'][$key]); 193 + if(!empty($goods_data['det_img'])){
  194 + $goods_data['det_img'] = json_decode($goods_data['det_img'],true);
  195 + foreach ($goods_data['det_img'] as $key => $val){
  196 + $goods_data['det_img'][$key] = cmf_get_image_url($goods_data['det_img'][$key]);
  197 + }
181 } 198 }
182 $this -> assign('goods_data',$goods_data); 199 $this -> assign('goods_data',$goods_data);
183 return $this -> fetch(); 200 return $this -> fetch();
@@ -135,7 +135,7 @@ @@ -135,7 +135,7 @@
135 商品说明 135 商品说明
136 </div> 136 </div>
137 <div class="log_six_input_contant"> 137 <div class="log_six_input_contant">
138 - <textarea cols="20" rows="3" placeholder="在此填写您的留言" id="instr"></textarea> 138 + <textarea cols="20" rows="3" placeholder="请输入商品说明" id="instr"></textarea>
139 </div> 139 </div>
140 </div> 140 </div>
141 <div class="log_two_input_one"> 141 <div class="log_two_input_one">
@@ -295,7 +295,13 @@ @@ -295,7 +295,13 @@
295 */ 295 */
296 function Sure_add(){ 296 function Sure_add(){
297 show_img = $('#show_img')[0].src; 297 show_img = $('#show_img')[0].src;
  298 + if(show_img == "http://www.xkeasy.com/themes/simpleboot3/public/assets/images/jiahao.png"){
  299 + show_img = '';
  300 + }
298 thumbnail = $('#thumbnail')[0].src; 301 thumbnail = $('#thumbnail')[0].src;
  302 + if(thumbnail == "http://www.xkeasy.com/themes/simpleboot3/public/assets/images/jiahao.png"){
  303 + thumbnail = '';
  304 + }
299 book_name = $("input[name='book_name']").val(); 305 book_name = $("input[name='book_name']").val();
300 money = $("input[name='money']").val(); 306 money = $("input[name='money']").val();
301 price = $("input[name='price']").val(); 307 price = $("input[name='price']").val();
@@ -312,8 +318,17 @@ @@ -312,8 +318,17 @@
312 printing = $("input[name='printing']").val(); 318 printing = $("input[name='printing']").val();
313 grade = $("#grade").text(); 319 grade = $("#grade").text();
314 img0 = $('#img0')[0].src; 320 img0 = $('#img0')[0].src;
  321 + if(img0 == "http://www.xkeasy.com/themes/simpleboot3/public/assets/images/jiahao.png"){
  322 + img0 = '';
  323 + }
315 img1 = $('#img1')[0].src; 324 img1 = $('#img1')[0].src;
  325 + if(img1 == "http://www.xkeasy.com/themes/simpleboot3/public/assets/images/jiahao.png"){
  326 + img1 = '';
  327 + }
316 img2 = $('#img2')[0].src; 328 img2 = $('#img2')[0].src;
  329 + if(img2 == "http://www.xkeasy.com/themes/simpleboot3/public/assets/images/jiahao.png"){
  330 + img2 = '';
  331 + }
317 332
318 $.post("{:url('Salesmangoods/Salesman_goods_add')}",{show_img:show_img,thumbnail:thumbnail,book_name:book_name,money:money,price:price,pricing:pricing,instr:instr,book_number:book_number,paper:paper,book_size:book_size,binding:binding,author:author,press:press,press_time:press_time,suit:suit,grade:grade,img0:img0,img1:img1,img2:img2,printing:printing},function(data){ 333 $.post("{:url('Salesmangoods/Salesman_goods_add')}",{show_img:show_img,thumbnail:thumbnail,book_name:book_name,money:money,price:price,pricing:pricing,instr:instr,book_number:book_number,paper:paper,book_size:book_size,binding:binding,author:author,press:press,press_time:press_time,suit:suit,grade:grade,img0:img0,img1:img1,img2:img2,printing:printing},function(data){
319 if(data){ 334 if(data){
@@ -144,7 +144,7 @@ @@ -144,7 +144,7 @@
144 商品说明 144 商品说明
145 </div> 145 </div>
146 <div class="log_six_input_contant"> 146 <div class="log_six_input_contant">
147 - <textarea cols="20" rows="3" placeholder="在此填写您的留言" id="instr">{$goods_data.instr}</textarea> 147 + <textarea cols="20" rows="3" placeholder="请输入商品说明" id="instr">{$goods_data.instr}</textarea>
148 </div> 148 </div>
149 </div> 149 </div>
150 <div class="log_two_input_one"> 150 <div class="log_two_input_one">
@@ -318,7 +318,13 @@ @@ -318,7 +318,13 @@
318 */ 318 */
319 function Sure_add(){ 319 function Sure_add(){
320 show_img = $('#show_img')[0].src; 320 show_img = $('#show_img')[0].src;
  321 + if(show_img == "http://www.xkeasy.com/themes/simpleboot3/public/assets/images/jiahao.png"){
  322 + show_img = '';
  323 + }
321 thumbnail = $('#thumbnail')[0].src; 324 thumbnail = $('#thumbnail')[0].src;
  325 + if(thumbnail == "http://www.xkeasy.com/themes/simpleboot3/public/assets/images/jiahao.png"){
  326 + thumbnail = '';
  327 + }
322 book_name = $("input[name='book_name']").val(); 328 book_name = $("input[name='book_name']").val();
323 money = $("input[name='money']").val(); 329 money = $("input[name='money']").val();
324 price = $("input[name='price']").val(); 330 price = $("input[name='price']").val();
@@ -336,12 +342,21 @@ @@ -336,12 +342,21 @@
336 printing = $("input[name='printing']").val(); 342 printing = $("input[name='printing']").val();
337 grade = $("#grade").text(); 343 grade = $("#grade").text();
338 img0 = $('#img0')[0].src; 344 img0 = $('#img0')[0].src;
  345 + if(img0 == "http://www.xkeasy.com/themes/simpleboot3/public/assets/images/jiahao.png"){
  346 + img0 = '';
  347 + }
339 img1 = $('#img1')[0].src; 348 img1 = $('#img1')[0].src;
  349 + if(img1 == "http://www.xkeasy.com/themes/simpleboot3/public/assets/images/jiahao.png"){
  350 + img1 = '';
  351 + }
340 img2 = $('#img2')[0].src; 352 img2 = $('#img2')[0].src;
  353 + if(img2 == "http://www.xkeasy.com/themes/simpleboot3/public/assets/images/jiahao.png"){
  354 + img2 = '';
  355 + }
341 356
342 $.post("{:url('Salesmangoods/Salesman_goods_edit')}",{id:id,show_img:show_img,thumbnail:thumbnail,book_name:book_name,money:money,price:price,pricing:pricing,instr:instr,book_number:book_number,paper:paper,book_size:book_size,binding:binding,author:author,press:press,press_time:press_time,suit:suit,grade:grade,img0:img0,img1:img1,img2:img2,printing:printing},function(data){ 357 $.post("{:url('Salesmangoods/Salesman_goods_edit')}",{id:id,show_img:show_img,thumbnail:thumbnail,book_name:book_name,money:money,price:price,pricing:pricing,instr:instr,book_number:book_number,paper:paper,book_size:book_size,binding:binding,author:author,press:press,press_time:press_time,suit:suit,grade:grade,img0:img0,img1:img1,img2:img2,printing:printing},function(data){
343 if(data){ 358 if(data){
344 - location.reload(); 359 + window.location.href="{:url('Salesmangoods/salesman_goods')}";
345 }else{ 360 }else{
346 alert('更新失败！'); 361 alert('更新失败！');
347 } 362 }