王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 390fcb8890ece1ad5d06f2a74c0e8ce381658d92 1 个父辈 b0573cd0
1 个管道 的构建 通过 耗费 1 秒

视频详情

内嵌 并排对比
正在显示 2 个修改的文件 包含 37 行增加 和 37 行删除
... ... @@ -3,7 +3,6 @@
<component name="ChangeListManager">
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/home/controller/Goods.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Goods.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/home/view/goods/content_detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/goods/content_detail.html" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -62,8 +61,8 @@
<file leaf-file-name="content_detail.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/home/view/goods/content_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="407">
<caret line="177" column="17" lean-forward="true" selection-start-line="177" selection-start-column="17" selection-end-line="177" selection-end-column="17" />
<state relative-caret-position="373">
<caret line="163" column="11" selection-start-line="163" selection-start-column="11" selection-end-line="163" selection-end-column="11" />
<folding>
<element signature="n#style#0;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
... ... @@ -100,7 +99,7 @@
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="674">
<caret line="120" column="43" selection-start-line="120" selection-start-column="43" selection-end-line="120" selection-end-column="43" />
<caret line="120" column="59" selection-start-line="120" selection-start-column="59" selection-end-line="120" selection-end-column="59" />
</state>
</provider>
</entry>
... ... @@ -418,21 +417,7 @@
<workItem from="1572483209367" duration="35426000" />
<workItem from="1572568391799" duration="24440000" />
<workItem from="1572668245063" duration="699000" />
<workItem from="1572827640492" duration="23503000" />
</task>
<task id="LOCAL-00044" summary="调试授权登录">
<created>1572502485108</created>
<option name="number" value="00044" />
<option name="presentableId" value="LOCAL-00044" />
<option name="project" value="LOCAL" />
<updated>1572502485108</updated>
</task>
<task id="LOCAL-00045" summary="调试授权登录">
<created>1572502565105</created>
<option name="number" value="00045" />
<option name="presentableId" value="LOCAL-00045" />
<option name="project" value="LOCAL" />
<updated>1572502565105</updated>
<workItem from="1572827640492" duration="23741000" />
</task>
<task id="LOCAL-00046" summary="调试授权登录">
<created>1572503340201</created>
... ... @@ -763,11 +748,25 @@
<option name="project" value="LOCAL" />
<updated>1572859356334</updated>
</task>
<option name="localTasksCounter" value="93" />
<task id="LOCAL-00093" summary="视频详情">
<created>1572860252481</created>
<option name="number" value="00093" />
<option name="presentableId" value="LOCAL-00093" />
<option name="project" value="LOCAL" />
<updated>1572860252481</updated>
</task>
<task id="LOCAL-00094" summary="视频详情">
<created>1572860384007</created>
<option name="number" value="00094" />
<option name="presentableId" value="LOCAL-00094" />
<option name="project" value="LOCAL" />
<updated>1572860384007</updated>
</task>
<option name="localTasksCounter" value="95" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="297606000" />
<option name="totallyTimeSpent" value="297844000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -1180,14 +1179,14 @@
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="674">
<caret line="120" column="43" selection-start-line="120" selection-start-column="43" selection-end-line="120" selection-end-column="43" />
<caret line="120" column="59" selection-start-line="120" selection-start-column="59" selection-end-line="120" selection-end-column="59" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/goods/content_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="407">
<caret line="177" column="17" lean-forward="true" selection-start-line="177" selection-start-column="17" selection-end-line="177" selection-end-column="17" />
<state relative-caret-position="373">
<caret line="163" column="11" selection-start-line="163" selection-start-column="11" selection-end-line="163" selection-end-column="11" />
<folding>
<element signature="n#style#0;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
... ...
... ... @@ -149,6 +149,19 @@
{include file="public/js" /}
<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.4.0.js"></script>
<script>
wx.config(
{$jssdk}
);
wx.ready(function () {
wx.getLocation({
success: function (res) {
alert(JSON.stringify(res));
},
cancel: function (res) {
alert('用户拒绝授权获取地理位置');
}
});
});
$(function(){
//全局变量
var goods_id = "{$data.id}";//用户id
... ... @@ -162,19 +175,7 @@
var lat = '';
var lng = '';
//定位当前位置
wx.config(
{$jssdk}
);
wx.ready(function () {
wx.getLocation({
success: function (res) {
alert(JSON.stringify(res));
},
cancel: function (res) {
alert('用户拒绝授权获取地理位置');
}
});
}
// var geolocation = new qq.maps.Geolocation("JMPBZ-DV7WU-WT4V7-BYCU2-XG3E5-OZB7T", "广告公众号");
// var positionNum = 0;
// var options = {
... ...