王智 / sedum · 提交

转到一个项目

作者 王智
提交 d5619c4eaa179e54b0609d089d9a6c6a64c4e4ca 1 个父辈 660d8bd6

修改

内嵌 并排对比
正在显示 3 个修改的文件 包含 49 行增加 和 16 行删除
... ... @@ -76,6 +76,12 @@
<input id="c-sales" data-rule="required" class="form-control" name="row[sales]" type="number">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Goods_code')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-goods_code" data-rule="required" class="form-control" name="row[goods_code]" type="text">
</div>
</div>
<div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8">
... ...
... ... @@ -4,10 +4,16 @@
<label class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
<div class="col-xs-12 col-sm-8">
<div class="input-group">
<input id="c-image" data-rule="required" class="form-control" size="50" name="row[image]" type="text" value="{$row.image|htmlentities}">
<input id="c-image" data-rule="required" class="form-control" size="50" name="row[image]" type="text"
value="{$row.image|htmlentities}">
<div class="input-group-addon no-border no-padding">
<span><button type="button" id="faupload-image" class="btn btn-danger faupload" data-input-id="c-image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
<span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
<span><button type="button" id="faupload-image" class="btn btn-danger faupload"
data-input-id="c-image"
data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp"
data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
<span><button type="button" id="fachoose-image" class="btn btn-primary fachoose"
data-input-id="c-image" data-mimetype="image/*" data-multiple="false"><i
class="fa fa-list"></i> {:__('Choose')}</button></span>
</div>
<span class="msg-box n-right" for="c-image"></span>
</div>
... ... @@ -17,41 +23,53 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-title" data-rule="required" class="form-control" name="row[title]" type="text" value="{$row.title|htmlentities}">
<input id="c-title" data-rule="required" class="form-control" name="row[title]" type="text"
value="{$row.title|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Speci')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-speci" data-rule="required" class="form-control" name="row[speci]" type="text" value="{$row.speci|htmlentities}">
<input id="c-speci" data-rule="required" class="form-control" name="row[speci]" type="text"
value="{$row.speci|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-price" data-rule="required" class="form-control" step="0.01" name="row[price]" type="number" value="{$row.price|htmlentities}">
<input id="c-price" data-rule="required" class="form-control" step="0.01" name="row[price]" type="number"
value="{$row.price|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Delete_price')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-delete_price" data-rule="" class="form-control" step="0.01" name="row[delete_price]" type="number" value="{$row.delete_price|htmlentities}">
<input id="c-delete_price" data-rule="" class="form-control" step="0.01" name="row[delete_price]"
type="number" value="{$row.delete_price|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Questionlabel_ids')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-QuestionLabel_ids" data-rule="required" data-source="question_label/index" data-field="title" data-multiple="true" class="form-control selectpage" name="row[QuestionLabel_ids]" type="text" value="{$row.QuestionLabel_ids|htmlentities}">
<input id="c-QuestionLabel_ids" data-rule="required" data-source="question_label/index" data-field="title"
data-multiple="true" class="form-control selectpage" name="row[QuestionLabel_ids]" type="text"
value="{$row.QuestionLabel_ids|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Long_image')}:</label>
<div class="col-xs-12 col-sm-8">
<div class="input-group">
<input id="c-long_image" data-rule="required" class="form-control" size="50" name="row[long_image]" type="text" value="{$row.long_image|htmlentities}">
<input id="c-long_image" data-rule="required" class="form-control" size="50" name="row[long_image]"
type="text" value="{$row.long_image|htmlentities}">
<div class="input-group-addon no-border no-padding">
<span><button type="button" id="faupload-long_image" class="btn btn-danger faupload" data-input-id="c-long_image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-long_image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
<span><button type="button" id="fachoose-long_image" class="btn btn-primary fachoose" data-input-id="c-long_image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
<span><button type="button" id="faupload-long_image" class="btn btn-danger faupload"
data-input-id="c-long_image"
data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp"
data-multiple="false" data-preview-id="p-long_image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
<span><button type="button" id="fachoose-long_image" class="btn btn-primary fachoose"
data-input-id="c-long_image" data-mimetype="image/*" data-multiple="false"><i
class="fa fa-list"></i> {:__('Choose')}</button></span>
</div>
<span class="msg-box n-right" for="c-long_image"></span>
</div>
... ... @@ -61,19 +79,29 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('One_talk')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-one_talk" data-rule="required" class="form-control" name="row[one_talk]" type="text" value="{$row.one_talk|htmlentities}">
<input id="c-one_talk" data-rule="required" class="form-control" name="row[one_talk]" type="text"
value="{$row.one_talk|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Stock')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-stock" data-rule="required" class="form-control" name="row[stock]" type="number" value="{$row.stock|htmlentities}">
<input id="c-stock" data-rule="required" class="form-control" name="row[stock]" type="number"
value="{$row.stock|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Sales')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-sales" data-rule="required" class="form-control" name="row[sales]" type="number" value="{$row.sales|htmlentities}">
<input id="c-sales" data-rule="required" class="form-control" name="row[sales]" type="number"
value="{$row.sales|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Goods_code')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-goods_code" data-rule="required" class="form-control" name="row[goods_code]" type="text"
value="{$row.goods_code|htmlentities}">
</div>
</div>
<div class="form-group layer-footer">
... ...
... ... @@ -100,6 +100,7 @@ class GuanYiCloud extends Api
$this->success('成功', json_decode($this->mycurl(URL, $data)));
}
//获取订单 $OrderSn 平台单号
public function getOrders()
{
... ... @@ -130,8 +131,6 @@ class GuanYiCloud extends Api
$Return = [
//发货状态 0-未发货//1-部分发货//2-全部发货
'delivery_state' => $delivery_state,
//退款状态 0:未退款//1:退款成功//2:退款中
'refund' => $refund,
//平台单号
'platform_code' => $platform_code,
//快递公司名称
... ...