Authored by xuhongyun

Merge branch 'test' into grey

# Conflicts:
#	code/apps/goods/controllers/basegoods.js
#	code/apps/shop/views/Edit.html
... ... @@ -99,7 +99,7 @@ module.exports=function(app) {
/*通过任务ID查看任务是否被执行完*/
app.post("/product/queryBatchImportResult","basegoods_queryBatchImportResult");
/*批量*/
app.get("/supplier/baseproduct/batchSetPortal","goods.batchSetPortal.Batch",function(){
this.$extend={
... ... @@ -120,5 +120,4 @@ module.exports=function(app) {
/*通过任务ID查看任务是否被执行完 学生价变价*/
app.post("/product/queryBatchImportStudentPriceResult","basegoods_queryBatchUpdateStudentPriceResult");
/*app.post("/product/queryBatchImportResult","basegoods_queryBatchUpdateStudentPriceResult");*/
}
\ No newline at end of file
... ...
... ... @@ -60,10 +60,8 @@
<input id="url" class="form-control" value="[[url]]" type="text" disabled="disabled"
style="cursor:default" required prompt="app文件">
</div>
<div class="col-sm-4" style="position: relative">
<input id="appFile" name="appFile" class="btn btn-default excel-upload" type="file"
style="position: absolute; top: 0;left: 0;">
<div id="fileBtn" class="file-name btn btn-default">请选择文件</div>
<div class="col-sm-4" style="position: relative">
<div id="fileBtn" class="btn btn-info" style="display:none">安卓路径</div>
</div>
</div>
<div class="form-group">
... ...
... ... @@ -43,6 +43,7 @@
aria-describedby="basic-addon2" required>
<span class="input-group-addon" id="basic-addon2">.yohobuy.com</span>
</div>
<p style="margin-top: 10px"><span class="red">注:1. 1-32个字符;2. 只能填英文和破折号-,不区分大小写,不能以破折号开头或者结尾</span></p>
</div>
</div>
<div class="form-group">
... ... @@ -84,7 +85,8 @@
<label>店铺Logo:</label>
</div>
<div class="col-sm-8">
<input type="file" id="shopLogo" name="shopLogo" value="<%data.shopLogo%>">
<input type="file" id="shopLogo" name="shopLogo" value="<%data.shopLogo%>" size="500">
<p><span class="red" style="position: absolute; bottom: 0">提示: 请上传像素为150*150的图片,大小小于500KB</span></p>
</div>
</div>
<div class="form-group">
... ...
... ... @@ -5,7 +5,7 @@ var $ = require('jquery'),
common = require('../../../common/common');
var VersionData = {};
const iphoneUrl = "http://www.pgyer.com/apiv1/app/install?_api_key=96ad2e5ad6e718a25cf33184375e8447&aId=c6f11a046941fa1dc09480a7123a3019&password=yoho9646";
const iphoneUrl = "itms-services://?action=download-manifest&url=https://cdn.yoho.cn/applist/yohovendor/ios/manifest.plist";
new common.dropDown({el: "#clientType"});
... ... @@ -111,12 +111,19 @@ $(document).on("change", ".observe", function () {
if(name == "clientType") {
if (val == "iphone" || val == "ipad") {
$("#url").val(iphoneUrl);
$("#url").attr("disabled","disabled");
$("#appFile").hide();
$("#fileBtn").hide();
} else {
$("#url").val("");
} else if(val == "android") {
$("#url").val("http://cdn.yoho.cn/applist/yohovendor/android/yhvendor081902.apk");
$("#appFile").show();
$("#fileBtn").show();
$("#url").removeAttr("disabled");
}else{
$("#url").val("");
$("#url").attr("disabled","disabled");
$("#appFile").hide();
$("#fileBtn").hide();
}
}
});
... ...
... ... @@ -9,7 +9,7 @@ webpackJsonp([91],[
common = __webpack_require__(2);
var VersionData = {};
const iphoneUrl = "http://www.pgyer.com/apiv1/app/install?_api_key=96ad2e5ad6e718a25cf33184375e8447&aId=c6f11a046941fa1dc09480a7123a3019&password=yoho9646";
const iphoneUrl = "itms-services://?action=download-manifest&url=https://cdn.yoho.cn/applist/yohovendor/ios/manifest.plist";
new common.dropDown({el: "#clientType"});
... ... @@ -115,12 +115,19 @@ webpackJsonp([91],[
if(name == "clientType") {
if (val == "iphone" || val == "ipad") {
$("#url").val(iphoneUrl);
$("#url").attr("disabled","disabled");
$("#appFile").hide();
$("#fileBtn").hide();
} else {
$("#url").val("");
} else if(val == "android") {
$("#url").val("http://cdn.yoho.cn/applist/yohovendor/android/yhvendor081902.apk");
$("#appFile").show();
$("#fileBtn").show();
$("#url").removeAttr("disabled");
}else{
$("#url").val("");
$("#url").attr("disabled","disabled");
$("#appFile").hide();
$("#fileBtn").hide();
}
}
});
... ...
... ... @@ -99,7 +99,7 @@ module.exports=function(app) {
/*通过任务ID查看任务是否被执行完*/
app.post("/product/queryBatchImportResult","basegoods_queryBatchImportResult");
/*批量*/
app.get("/supplier/baseproduct/batchSetPortal","goods.batchSetPortal.Batch",function(){
this.$extend={
... ... @@ -120,5 +120,4 @@ module.exports=function(app) {
/*通过任务ID查看任务是否被执行完 学生价变价*/
app.post("/product/queryBatchImportStudentPriceResult","basegoods_queryBatchUpdateStudentPriceResult");
/*app.post("/product/queryBatchImportResult","basegoods_queryBatchUpdateStudentPriceResult");*/
}
\ No newline at end of file
... ...
... ... @@ -60,10 +60,8 @@
<input id="url" class="form-control" value="[[url]]" type="text" disabled="disabled"
style="cursor:default" required prompt="app文件">
</div>
<div class="col-sm-4" style="position: relative">
<input id="appFile" name="appFile" class="btn btn-default excel-upload" type="file"
style="position: absolute; top: 0;left: 0;">
<div id="fileBtn" class="file-name btn btn-default">请选择文件</div>
<div class="col-sm-4" style="position: relative">
<div id="fileBtn" class="btn btn-info" style="display:none">安卓路径</div>
</div>
</div>
<div class="form-group">
... ...
... ... @@ -43,6 +43,7 @@
aria-describedby="basic-addon2" required>
<span class="input-group-addon" id="basic-addon2">.yohobuy.com</span>
</div>
<p style="margin-top: 10px"><span class="red">注:1. 1-32个字符;2. 只能填英文和破折号-,不区分大小写,不能以破折号开头或者结尾</span></p>
</div>
</div>
<div class="form-group">
... ... @@ -84,7 +85,8 @@
<label>店铺Logo:</label>
</div>
<div class="col-sm-8">
<input type="file" id="shopLogo" name="shopLogo" value="<%data.shopLogo%>">
<input type="file" id="shopLogo" name="shopLogo" value="<%data.shopLogo%>" size="500">
<p><span class="red" style="position: absolute; bottom: 0">提示: 请上传像素为150*150的图片,大小小于500KB</span></p>
</div>
</div>
<div class="form-group">
... ...